Skip to content

Commit 3e26a6a

Browse files
Makefile: MSYS2: export env flag
Co-Authored-By: Elliot Saba <[email protected]>
1 parent 89e0333 commit 3e26a6a

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

cli/Makefile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ DEBUGFLAGS += -DDEP_LIBS="\"$(LOADER_DEBUG_BUILD_DEP_LIBS)\""
3131
ifneq (,$(findstring MINGW,$(shell uname)))
3232
# In MSYS2, do not perform path conversion for `DEP_LIBS`.
3333
# https://www.msys2.org/wiki/Porting/#filesystem-namespaces
34-
CC_WITH_ENV := MSYS2_ARG_CONV_EXCL="-DDEP_LIBS=" $(CC)
35-
else
36-
CC_WITH_ENV := $(CC)
34+
export MSYS2_ARG_CONV_EXCL := "-DDEP_LIBS="
3735
endif # in MSYS2?
3836

3937
EXE_OBJS := $(BUILDDIR)/loader_exe.o
@@ -52,9 +50,9 @@ all: release debug
5250
release debug : % : julia-% libjulia-%
5351

5452
$(BUILDDIR)/loader_lib.o : $(SRCDIR)/loader_lib.c $(HEADERS) $(JULIAHOME)/VERSION
55-
@$(call PRINT_CC, $(CC_WITH_ENV) -DLIBRARY_EXPORTS $(SHIPFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
53+
@$(call PRINT_CC, $(CC) -DLIBRARY_EXPORTS $(SHIPFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
5654
$(BUILDDIR)/loader_lib.dbg.obj : $(SRCDIR)/loader_lib.c $(HEADERS) $(JULIAHOME)/VERSION
57-
@$(call PRINT_CC, $(CC_WITH_ENV) -DLIBRARY_EXPORTS $(DEBUGFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
55+
@$(call PRINT_CC, $(CC) -DLIBRARY_EXPORTS $(DEBUGFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
5856
$(BUILDDIR)/loader_exe.o : $(SRCDIR)/loader_exe.c $(HEADERS) $(JULIAHOME)/VERSION
5957
@$(call PRINT_CC, $(CC) $(SHIPFLAGS) $(LOADER_CFLAGS) -c $< -o $@)
6058
$(BUILDDIR)/loader_exe.dbg.obj : $(SRCDIR)/loader_exe.c $(HEADERS) $(JULIAHOME)/VERSION

0 commit comments

Comments
 (0)