diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-02-10 11:22:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-26 12:46:49 +0200 |
| commit | 0f6bbf15962cb4beaffe6b04a5836fe776c77925 (patch) | |
| tree | 3b3af849ba5bdd6c1b5e90c8b1e33f8c994e5b7a /external/firebird | |
| parent | 2f21e365873b33e40be8109e81107520fa60fc70 (diff) | |
-fno-weak is unknown in the Clang 3.4 in current Xcode (5.1)
(cherry picked from commit dd06463eadd9fe5e3e33e01be3d1aa3bd7c33abc)
Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I10611e97c17de9c00b818e22ac88ffbb736aaf37
Reviewed-on: https://gerrit.libreoffice.org/8752
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/firebird')
| -rw-r--r-- | external/firebird/firebird-macosx.patch.1 | 6 |
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 |