You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/07/25 10:08:36 UTC

svn commit: r1506842 - /openoffice/branches/rejuvenate01/main/RepositoryFixes.mk

Author: hdu
Date: Thu Jul 25 08:08:35 2013
New Revision: 1506842

URL: http://svn.apache.org/r1506842
Log:
#i122362# use libc++ instead of libstdc++ for new MacOSX targets

Modified:
    openoffice/branches/rejuvenate01/main/RepositoryFixes.mk

Modified: openoffice/branches/rejuvenate01/main/RepositoryFixes.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/RepositoryFixes.mk?rev=1506842&r1=1506841&r2=1506842&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/RepositoryFixes.mk (original)
+++ openoffice/branches/rejuvenate01/main/RepositoryFixes.mk Thu Jul 25 08:08:35 2013
@@ -50,7 +50,11 @@ gb_Library_FILENAMES := $(patsubst salhe
 gb_Library_FILENAMES := $(patsubst ucbhelper:libucbhelper%,ucbhelper:libucbhelper4%,$(gb_Library_FILENAMES))
 
 ifeq ($(USE_SYSTEM_STL),YES)
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
+gb_Library_FILENAMES := $(patsubst stl:%,stl:libc++.dylib,$(gb_Library_FILENAMES))
+else # use libstdc++ instead on ancient MacOSX targets
 gb_Library_FILENAMES := $(patsubst stl:%,stl:libstdc++.dylib,$(gb_Library_FILENAMES))
+endif
 gb_Library_TARGETS := $(filter-out stl,$(gb_Library_TARGETS))
 endif