From 9fec874907d3d11db411e418d250ebe41317bb37 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Mon, 25 Jul 2011 22:51:55 +0300
Subject: Use gb_OBJCXXFLAGS for iOS, too

---
 vcl/Library_vcl.mk           | 5 ++---
 vcl/StaticLibrary_vclmain.mk | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'vcl')

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1cd58bcb3601..013d6a1eae00 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -236,9 +236,8 @@ $(eval $(call gb_Library_add_nativeres,vcl,src))
 endif
 
 ifeq ($(GUIBASE),cocoatouch)
-$(eval $(call gb_Library_set_cxxflags,vcl,\
-    $$(CXXFLAGS) \
-    $$(OBJCXXFLAGS) \
+$(eval $(call gb_Library_add_cxxflags,vcl,\
+    $(gb_OBJCXXFLAGS) \
 ))
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
     vcl/ios/source/app/salnstimer \
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 4c313f88b082..6c9cc48526a5 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -28,9 +28,8 @@
 $(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
 
 ifeq ($(OS),IOS)
-$(eval $(call gb_StaticLibrary_set_cxxflags,vclmain,\
-    $$(CXXFLAGS) \
-    -x objective-c++ -fobjc-abi-version=2 -fobjc-legacy-dispatch -D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 \
+$(eval $(call gb_StaticLibrary_add_cxxflags,vclmain,\
+    $(gb_OBJCXXFLAGS) \
 ))
 endif
 
-- 
cgit v1.2.3