[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc vcl/Library_vcl.mk

[Jim Jagielski]

 solenv/inc/unxmacc.mk |    2 +-
 solenv/inc/unxmacx.mk |    2 +-
 vcl/Library_vcl.mk    |    6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 965224b537cbf234195818075d1172184fc3193e
Author: Jim Jagielski <jim at apache.org>
Date:   Mon Oct 9 17:07:51 2017 +0000

    Get macOS compiling again:
    
    o Restore 10.7 as min
    o Deprecated is no longer a fatal warning error
    o We need LDFLAGS when linking

diff --git a/solenv/inc/unxmacc.mk b/solenv/inc/unxmacc.mk
index dc651800b678..523dba9b5578 100644
--- a/solenv/inc/unxmacc.mk
+++ b/solenv/inc/unxmacc.mk
@@ -142,7 +142,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 8169c14b83a5..46c5252d809a 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -143,7 +143,7 @@ CFLAGSWARNCC=-Wall -Wendif-labels
 CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor
 CFLAGSWALLCC=$(CFLAGSWARNCC)
 CFLAGSWALLCXX=$(CFLAGSWARNCXX)
-CFLAGSWERRCC=-Werror
+CFLAGSWERRCC=-Werror -Wno-error=deprecated
 
 # All modules on this platform compile without warnings.
 # If you need to set MODULES_WITH_WARNINGS here, comment
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 6947ae8394ef..0f6393ce9ec1 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -105,6 +105,12 @@ $(eval $(call gb_Library_add_libs,vcl,\
 
 endif
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+))
+endif
+
 ifeq ($(GUIBASE),aqua)
 $(eval $(call gb_Library_add_cxxflags,vcl,\
     $(gb_OBJCXXFLAGS) \