diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-03 14:48:55 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-03 14:58:29 +0200 |
| commit | ed19103fd482830378e633497bef5a2bef31b56b (patch) | |
| tree | e5f2449449ac537a69037a07c1b75d4471a2398c /nss | |
| parent | 929182933533f75f93da6042649cef2c81d4de90 (diff) | |
Convince nss to build with 64-bit MSVC
Change-Id: I1b840a03e87e1ca73239c0a3ee17741de97d1543
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/makefile.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index ec0dacda6319..eed291a3289c 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -87,6 +87,10 @@ CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$( CONFIGURE_ACTION+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .ENDIF +.IF "$(OS)$(COM)$(CPUNAME)"=="WNTMSCX86_64" +CONFIGURE_ACTION+=--enable-64bit +.ENDIF + CONFIGURE_ACTION+= ; \ sed -e 's\#@prefix@\#$(OUTDIR)\#' -e 's\#@includedir@\#$(OUTDIR)/inc/mozilla/nss\#' -e 's\#@MOD_MAJOR_VERSION@\#$(VER_MAJOR)\#' -e 's\#@MOD_MINOR_VERSION@\#$(VER_MINOR)\#' -e 's\#@MOD_PATCH_VERSION@\#$(VER_PATCH)\#' mozilla/security/nss/nss-config.in > mozilla/security/nss/nss-config ; \ chmod a+x mozilla/security/nss/nss-config @@ -224,9 +228,14 @@ OS_TARGET=WIN95 #To build nss one has to call "make nss_build_all" in #mozilla/security/nss + +.IF "$(CPUNAME)"=="X86_64" +PASS_USE_64=USE_64=1 +.ENDIF + NSS_BUILD_DIR=$(ABS_PACKAGE_DIR)/$(TARFILE_ROOTDIR)/mozilla/security/nss BUILD_ACTION= PATH="$(moz_build)/msys/bin:$(moz_build)/moztools/bin:$(PATH)" && $(MOZILLABUILD)/msys/bin/bash -i \ - -c "cd $(NSS_BUILD_DIR) && make nss_build_all" + -c "cd $(NSS_BUILD_DIR) && make $(PASS_USE_64) nss_build_all" OUT2LIB= \ mozilla/dist/out/lib/nspr4.lib \ |