summaryrefslogtreecommitdiff
path: root/firebird
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-07-17 10:17:52 +0300
committerTor Lillqvist <tml@iki.fi>2013-07-17 11:05:36 +0300
commit83364ad1ec3850a519551c6ae32e63902599b6dc (patch)
tree2b5fb9939466542e2b1fc58c7c0758edcd42d56b /firebird
parent09ed8830982f6947ee7fcb46a0ab7f4a68c41297 (diff)
We already have the -mmacosx-version-min option we want in CXX
No need to add a hardcoded -mmacosx-version-min=10.6 that overrides the switch in our CXX, especially as that causes a linking error when using libc++, as that requires OS X 10.7. Change-Id: Ieb0ccad7613fae793387e38be617e0cb6ac23d06
Diffstat (limited to 'firebird')
-rw-r--r--firebird/firebird-macosx.patch.126
1 files changed, 26 insertions, 0 deletions
diff --git a/firebird/firebird-macosx.patch.1 b/firebird/firebird-macosx.patch.1
index 984003e8b0ee..a92b81388a73 100644
--- a/firebird/firebird-macosx.patch.1
+++ b/firebird/firebird-macosx.patch.1
@@ -138,3 +138,29 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.
cp -r ../gen/firebird/help $(FB_FW)/Resources/English.lproj/var/help
cp ../gen/firebird/security2.fdb $(FB_FW)/Resources/English.lproj/var
mkdir -p $(FB_FW)/Resources/doc
+--- firebird.org/builds/posix/prefix.darwin_i386
++++ firebird/builds/posix/prefix.darwin_i386
+@@ -32,8 +32,8 @@
+
+ OS_ServerFiles=inet_server.cpp
+
+-PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.6
+-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.6
++PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
++DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
+ CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
+ EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
+ CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \
+--- firebird.org/builds/posix/prefix.darwin_x86_64
++++ firebird/builds/posix/prefix.darwin_x86_64
+@@ -27,8 +27,8 @@
+
+ OS_ServerFiles=inet_server.cpp
+
+-PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.6
+-DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.6
++PROD_FLAGS=-O1 -DDARWIN -pipe -p -MMD -fPIC -fno-common
++DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall
+ CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
+ EMBED_UTIL_TARGETS=gstat gds_relay gsec fbguard nbackup fb_lock_print fbsvcmgr fbtracemgr
+ CLIENT_UTIL_TARGETS=gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_lock_print fbsvcmgr \