diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-19 21:23:55 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-19 21:50:09 +0300 |
| commit | 9b74656d01e24f11a6980d2795bdc2b9b17e35bc (patch) | |
| tree | 76b92dbb963b47dbe8716a4c89b6ca05135c654c /nss | |
| parent | ed5c2c95b7ec0f6b81e4ad7b8dd481bf8e494b1d (diff) | |
Start on experimental support for 64-bit Mac code
Rename the --enable-cl-x64 switch to --enable-64-bit and make its
meaning more generic. Drop the CL_X64 config variable, introduce the
more generic BITNESS_OVERRIDE instead.
Does not build yet.
Change-Id: Iac66afe31dceaf40c8262fec2e5aef6a751ba3d2
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/makefile.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index ecd7e2261b92..bff00b280947 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -84,16 +84,24 @@ CONFIGURE_ACTION=mozilla/nsprpub/configure --prefix=$(my_prefix) --includedir=$( # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 -.ENDIF # "$(CPUNAME)"=="X86_64" -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.ENDIF +.ENDIF + +.IF "$(OS)$(COM)"=="MACOSXGCC" +.IF "$(BUILD64)"=="1" +# force 64-bit buildmode +USE_64:=1 +.EXPORT : USE_64 +.ENDIF +.ENDIF .IF "$(OS)$(COM)"=="FREEBSDGCC" .IF "$(CPUNAME)"=="X86_64" # force 64-bit buildmode USE_64:=1 .EXPORT : USE_64 -.ENDIF # "$(CPUNAME)"=="X86_64" -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.ENDIF +.ENDIF .IF "$(OS)"=="MACOSX" MACOS_SDK_DIR:=$(MACOSX_SDK_PATH) |