Skip to content

Commit d97f248

Browse files
authored
[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 26304f7 commit d97f248

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
@@ -459,8 +459,9 @@ endif
459459

460460

461461
exe:
462-
# run Inno Setup to compile installer
463-
$(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))
462+
# run Inno Setup to compile installer.
463+
# Note that we disable MSYS2 path munging, as it interferes with the `/` options:
464+
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))
464465
chmod a+x "$(BUILDROOT)/$(JULIA_BINARYDIST_FILENAME).exe"
465466

466467
app:
@@ -585,7 +586,7 @@ win-extras:
585586
cd $(JULIAHOME)/dist-extras && \
586587
$(JLDOWNLOAD) https://www.jrsoftware.org/download.php/is.exe && \
587588
chmod a+x is.exe && \
588-
$(call spawn, $(JULIAHOME)/dist-extras/is.exe /DIR="$(call cygpath_w,$(JULIAHOME)/dist-extras/inno)" /PORTABLE=1 /CURRENTUSER /VERYSILENT)
589+
MSYS2_ARG_CONV_EXCL='*' $(call spawn, $(JULIAHOME)/dist-extras/is.exe /DIR="$(call cygpath_w,$(JULIAHOME)/dist-extras/inno)" /PORTABLE=1 /CURRENTUSER /VERYSILENT)
589590

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

0 commit comments

Comments
 (0)