summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2010-11-27 17:11:35 +0300
committerMatthieu Patou <mat@samba.org>2010-11-27 18:02:41 +0100
commitcaa8a92f528387e047ecc5a03addbd67777b1c05 (patch)
tree40b5fd217eca93cc1e9496c438947708cdb2ab68
parente5eaed0180467bbe27b1fd6073298c18c3b1af8d (diff)
downloadsamba-caa8a92f528387e047ecc5a03addbd67777b1c05.tar.gz
samba-caa8a92f528387e047ecc5a03addbd67777b1c05.tar.bz2
samba-caa8a92f528387e047ecc5a03addbd67777b1c05.zip
build: change compile flags on mac os x if we face pb with common symbols
Autobuild-User: Matthieu Patou <mat@samba.org> Autobuild-Date: Sat Nov 27 18:02:41 CET 2010 on sn-devel-104
-rw-r--r--source4/wscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/wscript b/source4/wscript
index 80916f5579..48f340cf09 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -87,8 +87,10 @@ def configure(conf):
conf.check_python_headers(mandatory=True)
if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
- if not conf.CHECK_SHLIB_W_PYTHON("Checking if -single_module is not needed"):
- conf.env.append_value('shlib_LINKFLAGS', ['-single_module'])
+ # Mac OSX needs to have this and it's also needed that the python is compiled with this
+ # otherwise you face errors about common symbols
+ if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
+ conf.ADD_CFLAGS('-fno-common')
if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
conf.env.append_value('shlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
if int(conf.env['PYTHON_VERSION'][0]) >= 3: