openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1556588 - /openoffice/trunk/main/nss/makefile.mk
Date Wed, 08 Jan 2014 17:51:36 GMT
Author: hdu
Date: Wed Jan  8 17:51:35 2014
New Revision: 1556588

URL: http://svn.apache.org/r1556588
Log:
#i122301# use the BUILD64 flag to simplify the NSS makefile

Modified:
    openoffice/trunk/main/nss/makefile.mk

Modified: openoffice/trunk/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1556588&r1=1556587&r2=1556588&view=diff
==============================================================================
--- openoffice/trunk/main/nss/makefile.mk (original)
+++ openoffice/trunk/main/nss/makefile.mk Wed Jan  8 17:51:35 2014
@@ -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_
 PATCH_FILES+=nss_linux.patch
 .ENDIF
 
-.ENDIF			# "$(GUI)"=="UNX"
-
 
 .IF "$(GUI)"=="WNT"
 



Mime
View raw message