From a2c31a754c2d75dcf6a674f365ad50fc40f595ec Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 26 Nov 2010 02:55:03 -0500 Subject: [PATCH] Windows: NSIS installer requires the architecture for CL=1400 The NSIS installer at present is 32-bit only. Production releases of OpenAFS have always been performed using the CL=1310 compiler so it wasn't noticed that src/WINNT/install/NSIS/NTMakefile did not define the ARCH (architecture) for the purpose of identifying which redistributable runtime library installer should be integrated into the build. For the CL=1310 compiler there are not prebuilt installers for OpenAFS to integrate. Change-Id: Ide80d5013f55dbcd97b7b099de7066c5afd0df14 Reviewed-on: http://gerrit.openafs.org/3388 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/WINNT/install/NSIS/NTMakefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile index 2b1c12adf..5b134474e 100644 --- a/src/WINNT/install/NSIS/NTMakefile +++ b/src/WINNT/install/NSIS/NTMakefile @@ -53,19 +53,25 @@ $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res !IF ("$(AFSDEV_BUILDTYPE)"=="FREE") !IF ("$(CPU)" == "i386") MSI_PLATFORM=Intel +ARCH=x86 !ELSE IF ("$(CPU)" == "amd64") MSI_PLATFORM=x64 +ARCH=x64 !ELSE MSI_PLATFORM=$(CPU) +ARCH=$(CPU) !ENDIF MSI_CONFIG=Retail !ELSE !IF ("$(CPU)" == "i386") MSI_PLATFORM=Intel +ARCH=x86 !ELSE IF ("$(CPU)" == "amd64") MSI_PLATFORM=x64 +ARCH=x64 !ELSE MSI_PLATFORM=$(CPU) +ARCH=$(CPU) !ENDIF MSI_CONFIG=Debug !ENDIF -- 2.39.5