Commit a122dbcd authored by Adrian Knoth's avatar Adrian Knoth
Browse files

wscript. Fix relocation link error (missing -fPIC)

Idea for this fix found in
   http://code.google.com/p/waf/issues/detail?id=800#c1
parent cb68c828
......@@ -106,7 +106,7 @@ def build(bld):
]
includes = ['../macosx', '../macosx/RPC', '../posix'] + includes
serverlib = bld(features = ['cxx', 'cxxshlib'])
serverlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
serverlib.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
serverlib.includes = includes
serverlib.name = 'serverlib'
......@@ -188,7 +188,7 @@ def build(bld):
serverlib.env.append_value("LINKFLAGS", "-lnsl -lsocket")
if bld.env['BUILD_NETLIB'] == True:
netlib = bld(features = ['cxx', 'cxxshlib'])
netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
netlib.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
netlib.includes = includes
netlib.name = 'netlib'
......@@ -221,7 +221,7 @@ def build(bld):
netlib.vnum = bld.env['JACK_API_VERSION']
clientlib = bld(features = ['cxx', 'cxxshlib'])
clientlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
clientlib.defines = 'HAVE_CONFIG_H'
clientlib.use = uselib
clientlib.install_path = '${LIBDIR}'
......
......@@ -14,7 +14,7 @@ def configure(conf):
conf.define('HAVE_PPOLL', 1 )
def create_jack_driver_obj(bld, target, sources, uselib = None):
driver = bld(features = ['cxx', 'cxxshlib'])
driver = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'])
driver.env['cxxshlib_PATTERN'] = 'jack_%s.so'
#driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL']
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment