[Libreoffice-commits] core.git: Branch 'aoo/trunk' - RepositoryFixes.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Jan 8 21:08:17 UTC 2019


 RepositoryFixes.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit e740db63c438be0e387b9f5a1d0fd6d81afb825e
Author:     Jim Jagielski <jim at apache.org>
AuthorDate: Tue Jan 8 20:39:48 2019 +0000
Commit:     Jim Jagielski <jim at apache.org>
CommitDate: Tue Jan 8 20:39:48 2019 +0000

    Bring somewhat up to date... remove reference to 10.4 and allow for newer SDKs for 4.20.x

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 8bbed45f8ab7..770076337604 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -75,11 +75,7 @@ gb_Library_FILENAMES := $(patsubst store:libuno_store%,store:libstore%,$(gb_Libr
 gb_Library_FILENAMES := $(patsubst sunjavaplugin:libsunjavaplugin%,sunjavaplugin:sunjavaplugin%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst jurt:libjpipe.dylib%,jurt:libjpipe.jnilib%,$(gb_Library_FILENAMES))
 
-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 # ifeq ($(OS),MACOSX)


More information about the Libreoffice-commits mailing list