summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharlie Lenahan <charlie.lenahan@intel.com>2015-06-08 20:06:00 -0400
committerErich Keane <erich.keane@intel.com>2015-06-17 20:04:11 +0000
commitc601302d923140bf6a0e1a71f87938920d159bd3 (patch)
treea0b05fbb41e741bd7bed53ff5b80204a0dea1f14
parent9ad36b0477220ffc948638b9059139eed2bdb517 (diff)
resolve unresolved symbols on linux
Change-Id: I6f80135e75e65726b59c8ff5e773c6019c56d828 Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com> Reviewed-on: https://gerrit.iotivity.org/gerrit/1223 Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org> Reviewed-by: Robert Cole <robert.cole@intel.com> Reviewed-by: Erich Keane <erich.keane@intel.com>
-rw-r--r--build_common/SConscript.py2
-rw-r--r--ra_xmpp/SConscript.py11
2 files changed, 11 insertions, 2 deletions
diff --git a/build_common/SConscript.py b/build_common/SConscript.py
index 8ecf824..37bd5ca 100644
--- a/build_common/SConscript.py
+++ b/build_common/SConscript.py
@@ -51,7 +51,7 @@ os_arch_map = {
# Configure command-line variables
help_vars = Variables()
help_vars.Add(BoolVariable('VERBOSE', 'Show compilation details?', 'no'))
-help_vars.Add(BoolVariable('RELEASE', 'Build for release?', 'no')) # set to 'no', 'false' or 0 for debug
+help_vars.Add(BoolVariable('RELEASE', 'Build for release?', 'true')) # set to 'no', 'false' or 0 for debug
help_vars.Add(EnumVariable('TARGET_OS', 'Target platform', platform_host(), host_target_map[platform_host()]))
help_vars.Add(BoolVariable('STROPHE', 'Use libstrophe in place of C++ stream processor', 'no'))
diff --git a/ra_xmpp/SConscript.py b/ra_xmpp/SConscript.py
index f4def4b..342d275 100644
--- a/ra_xmpp/SConscript.py
+++ b/ra_xmpp/SConscript.py
@@ -53,7 +53,7 @@ if target_os not in ['windows', 'winrt']:
],
LIBS = ['strophe'])
ra_xmpp_env.Append(
- LIBS = ['ccfxmpp'],
+ LIBS = ['ccfxmpp','safec-1.0','pthread'],
LIBPATH = ['#src']
)
@@ -76,12 +76,21 @@ if target_os not in ['windows', 'winrt']:
'-Wno-unknown-pragmas', # Ignore any windows-specific pragmas (don't warn)
'-fPIC',
])
+
if target_os not in ['darwin','ios']:
ra_xmpp_env.AppendUnique(
+ LINKFLAGS = [
+ '-Wl,--no-undefined'
+ ],
CXXFLAGS = [
'-Wl,--gc-sections',
'-Wl,--strip-all',
])
+ else:
+ ra_xmpp_env.AppendUnique(
+ LINKFLAGS = [
+ '-Wl,-undefined,error'
+ ])
if not env['RELEASE']:
ra_xmpp_env.AppendUnique(CXXFLAGS = [