openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1541875 - /openoffice/branches/rejuvenate01/main/nss/makefile.mk
Date Thu, 14 Nov 2013 10:58:53 GMT
Author: hdu
Date: Thu Nov 14 10:58:52 2013
New Revision: 1541875

URL: http://svn.apache.org/r1541875
Log:
#i123685# fix build of nss for 64bit-AOO on OSX

Modified:
    openoffice/branches/rejuvenate01/main/nss/makefile.mk

Modified: openoffice/branches/rejuvenate01/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/nss/makefile.mk?rev=1541875&r1=1541874&r2=1541875&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/nss/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/nss/makefile.mk Thu Nov 14 10:58:52 2013
@@ -45,7 +45,7 @@ TARFILE_ROOTDIR=nss-3.14.4
 PATCH_FILES=nss.patch
 
 .IF "$(OS)"=="MACOSX"
-MACOS_SDK_DIR=/Developer/SDKs/MacOSX10.4u.sdk
+MACOS_SDK_DIR=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
 .EXPORT : MACOS_SDK_DIR
 PATCH_FILES+=nss_macosx.patch
 .ENDIF # "$(OS)"=="MACOSX"
@@ -56,31 +56,13 @@ BUILD_OPT=1
 .EXPORT: BUILD_OPT
 .ENDIF
 
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)$(COM)"=="LINUXGCC"
-.IF "$(BUILD64)"=="1"
-# force 64-bit buildmode
-USE_64:=1
-.EXPORT : USE_64
-.ENDIF			# "$(CPU)"=="X"
-.ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)$(COM)"=="FREEBSDGCC"
 .IF "$(CPU)"=="X"
+#.IF "$(BUILD64)"=="1"
 # force 64-bit buildmode
 USE_64:=1
 .EXPORT : USE_64
+#.ENDIF			# "$(BUILD64)"=="1"
 .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"
 
 OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
 



Mime
View raw message