diff options
| -rw-r--r-- | nss/makefile.mk | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index b9e482fd6d84..ce00499fcfc9 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -56,31 +56,11 @@ BUILD_OPT=1 .EXPORT: BUILD_OPT .ENDIF -.IF "$(GUI)"=="UNX" -.IF "$(OS)$(COM)"=="LINUXGCC" .IF "$(BUILD64)"=="1" -# force 64-bit buildmode +# force the 64-bit build mode for 64bit targets USE_64:=1 .EXPORT : USE_64 -.ENDIF # "$(CPU)"=="X" -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" - -.IF "$(OS)$(COM)"=="FREEBSDGCC" -.IF "$(CPU)"=="X" -# force 64-bit buildmode -USE_64:=1 -.EXPORT : USE_64 -.ENDIF # "$(CPU)"=="X" -.ENDIF # "$(OS)$(COM)"=="LINUXGCC" - -.IF "$(OS)"=="MACOSX" -.IF "$(EXTRA_CFLAGS)"!="" -CPP:=gcc -E $(EXTRA_CFLAGS) -CXX:=g++ $(EXTRA_CFLAGS) -CC:=gcc $(EXTRA_CFLAGS) -.EXPORT : CPP -.ENDIF # "$(EXTRA_CFLAGS)"!="" -.ENDIF # "$(OS)"=="MACOSX" +.ENDIF # "$(BUILD64)"=="1" OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST) @@ -92,8 +72,6 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1 PATCH_FILES+=nss_linux.patch .ENDIF -.ENDIF # "$(GUI)"=="UNX" - .IF "$(GUI)"=="WNT" |