BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated waf wscript with hack for getting clang to link to static libnorm.a where desired

pull/9/head
bebopagogo 2019-10-16 19:09:05 -04:00
parent 1c3283fd3b
commit 269320f4f1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wscript
View File

@ -19,7 +19,6 @@ To build examples, use the --target directive. For example:
''' '''
import platform import platform
import waflib import waflib
# Fetch VERSION from include/normVersion.h file # Fetch VERSION from include/normVersion.h file
@ -74,7 +73,7 @@ def build(ctx):
# Setup to install NORM header file # Setup to install NORM header file
ctx.install_files("${PREFIX}/include/", "include/normApi.h") ctx.install_files("${PREFIX}/include/", "include/normApi.h")
ctx.objects( obj = ctx.objects(
target = 'objs', target = 'objs',
includes = ['include'], includes = ['include'],
export_includes = ['include'], export_includes = ['include'],
@ -108,6 +107,7 @@ def build(ctx):
use = ['objs'] + ctx.env.USE_BUILD_NORM, use = ['objs'] + ctx.env.USE_BUILD_NORM,
source = [], source = [],
features = 'cxx cxxshlib', features = 'cxx cxxshlib',
install_path = '${LIBDIR}',
) )
ctx.stlib( ctx.stlib(
@ -163,7 +163,7 @@ def build(ctx):
name = 'normapp', name = 'normapp',
target = 'normapp', target = 'normapp',
includes = ['include'], includes = ['include'],
use = ['protolib', 'norm_stlib'], use = ['protolib', 'norm_stlib'],
defines = [], defines = [],
source = ['src/common/{0}.cpp'.format(x) for x in [ source = ['src/common/{0}.cpp'.format(x) for x in [
'normPostProcess', 'normPostProcess',
@ -172,7 +172,11 @@ def build(ctx):
# Disabled by default # Disabled by default
posted = True, posted = True,
) )
# Hack to force clang to link static libnorm.a
if ctx.env.COMPILER_CXX == 'clang++':
normapp.linkflags ='libnorm.a'
if system in ('linux', 'darwin', 'freebsd', 'gnu', 'gnu/kfreebsd'): if system in ('linux', 'darwin', 'freebsd', 'gnu', 'gnu/kfreebsd'):
normapp.source.append('src/unix/unixPostProcess.cpp') normapp.source.append('src/unix/unixPostProcess.cpp')
@ -218,7 +222,8 @@ def build(ctx):
if system == "gnu": if system == "gnu":
static_libs += ' -lpcap' static_libs += ' -lpcap'
ctx(source='norm.pc.in', STATIC_LIBS = static_libs) ctx(source='norm.pc.in', STATIC_LIBS = static_libs)
def _make_simple_example(ctx, name, path='examples'): def _make_simple_example(ctx, name, path='examples'):
'''Makes a task from a single source file in the examples directory. '''Makes a task from a single source file in the examples directory.
@ -243,4 +248,8 @@ def _make_simple_example(ctx, name, path='examples'):
example.defines.append('_CONSOLE') example.defines.append('_CONSOLE')
else: else:
example.use.append('norm_stlib') example.use.append('norm_stlib')
# Hack to force clang to link static libnorm.a
if ctx.env.COMPILER_CXX == 'clang++':
example.linkflags ='libnorm.a'