summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-02-10 11:22:05 +0200
committerTor Lillqvist <tml@collabora.com>2014-02-10 11:23:38 +0200
commitdd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc (patch)
treea7f92023a544510ad89e49b04a29feb429b1d476 /external
parent46e63b70d99eab31758afd3abf29c2237b9248de (diff)
Seems that -fno-weak is unknown in upcoming Clang on OS X
Change-Id: I43bb17757f2b477674c49ad989393bb861c8d934
Diffstat (limited to 'external')
-rw-r--r--external/firebird/firebird-macosx.patch.16
1 files changed, 4 insertions, 2 deletions
diff --git a/external/firebird/firebird-macosx.patch.1 b/external/firebird/firebird-macosx.patch.1
index adede1c98688..0ad9bd90452a 100644
--- a/external/firebird/firebird-macosx.patch.1
+++ b/external/firebird/firebird-macosx.patch.1
@@ -87,14 +87,16 @@ diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.
export DYLD_LIBRARY_PATH
MACOSX_DEPLOYMENT_TARGET=10.6
-@@ -27,8 +27,8 @@
+@@ -27,9 +27,9 @@
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
+-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
+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
++CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
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 \
+ fbtracemgr