Skip to content

Commit e8fef01

Browse files
committed
[win] Disable MSYS2 path munging when calling is.exe (#46867)
Tragically, I believe MSYS2 is messing with options such as `/VERYSILENT` turning them instead into `C:\msys2\VERYSILENT` or similar.
1 parent 97bd559 commit e8fef01

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,8 +432,9 @@ endif
432432
cd $(BUILDROOT) && $(TAR) zcvf $(JULIA_BINARYDIST_FILENAME).tar.gz julia-$(JULIA_COMMIT)
433433

434434
exe:
435-
# run Inno Setup to compile installer
436-
$(call spawn,$(JULIAHOME)/dist-extras/inno/iscc.exe /DAppVersion=$(JULIA_VERSION) /DSourceDir="$(call cygpath_w,$(BUILDROOT)/julia-$(JULIA_COMMIT))" /DRepoDir="$(call cygpath_w,$(JULIAHOME))" /F"$(JULIA_BINARYDIST_FILENAME)" /O"$(call cygpath_w,$(BUILDROOT))" $(INNO_ARGS) $(call cygpath_w,$(JULIAHOME)/contrib/windows/build-installer.iss))
435+
# run Inno Setup to compile installer.
436+
# Note that we disable MSYS2 path munging, as it interferes with the `/` options:
437+
MSYS2_ARG_CONV_EXCL='*' $(call spawn,$(JULIAHOME)/dist-extras/inno/iscc.exe /DAppVersion=$(JULIA_VERSION) /DSourceDir="$(call cygpath_w,$(BUILDROOT)/julia-$(JULIA_COMMIT))" /DRepoDir="$(call cygpath_w,$(JULIAHOME))" /F"$(JULIA_BINARYDIST_FILENAME)" /O"$(call cygpath_w,$(BUILDROOT))" $(INNO_ARGS) $(call cygpath_w,$(JULIAHOME)/contrib/windows/build-installer.iss))
437438
chmod a+x "$(BUILDROOT)/$(JULIA_BINARYDIST_FILENAME).exe"
438439

439440
app:
@@ -558,7 +559,7 @@ win-extras:
558559
cd $(JULIAHOME)/dist-extras && \
559560
$(JLDOWNLOAD) https://www.jrsoftware.org/download.php/is.exe && \
560561
chmod a+x is.exe && \
561-
$(call spawn, $(JULIAHOME)/dist-extras/is.exe /DIR="$(call cygpath_w,$(JULIAHOME)/dist-extras/inno)" /PORTABLE=1 /CURRENTUSER /VERYSILENT)
562+
MSYS2_ARG_CONV_EXCL='*' $(call spawn, $(JULIAHOME)/dist-extras/is.exe /DIR="$(call cygpath_w,$(JULIAHOME)/dist-extras/inno)" /PORTABLE=1 /CURRENTUSER /VERYSILENT)
562563

563564
# various statistics about the build that may interest the user
564565
ifeq ($(USE_SYSTEM_LLVM), 1)

0 commit comments

Comments
 (0)