solenv/gbuild/platform/macosx.mk | 7 ++++++-
vcl/Library_vcl.mk | 3 ++-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 6f4da39da183978774be7cc241bf00e0c82a5e2c
Author: Jim Jagielski <j...@apache.org>
Date: Wed Nov 29 13:02:36 2017 +0000
OK, let's try to maintain 10.7 as the min OSX version supported.
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e71036bb22d9..7ec6a66a7155 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -107,6 +107,11 @@ ifneq ($(COM),GCC)
gb_CXXFLAGS += -DHAVE_STL_INCLUDE_PATH -I../v1/
endif
+ifeq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7
10.8))
+ gb_CXXFLAGS += -std=c++11 -stdlib=libc++
+ gb_macos_LDFLAGS := -std=c++11 -stdlib=libc++
+endif
+
# these are to get g++ to switch to Objective-C++ mode
# (see toolkit module for a case where it is necessary to do it this way)
gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
@@ -280,7 +285,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(filter
Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
$(if $(filter
Library,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(subst \d,$$,$(RPATH)) \
- $(T_LDFLAGS) \
+ $(T_LDFLAGS) $(gb_macos_LDFLAGS) \
$(if $(VERSIONMAP),$(gb_Library_VERSIONMAPFLAG) $(VERSIONMAP)) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 673e0e680ba1..89dbf0baa0a8 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -511,7 +511,8 @@ $(eval $(call gb_Library_add_libs,vcl,\
-framework CoreFoundation \
))
# ??? what about this
-ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+#ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),$(filter $(MACOSX_DEPLOYMENT_TARGET), 10.7
10.8))
$(eval $(call gb_Library_add_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
endif
endif
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
