Commit cbb4ac1f authored by Dan Mihai's avatar Dan Mihai

[IOT-2090] Linux: Fix the link order of c_common and logger

Don't prepend logger after c_common has been prepended, because the
linker wants c_common followed by logger in its command line.

Change-Id: I6cc0c6bfdb2d7e47609d98db8be42fc9e878b1ba
Signed-off-by: default avatarDan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/19145Tested-by: default avatarjenkins-iotivity <jenkins@iotivity.org>
parent 8c6fd1e0
......@@ -212,4 +212,6 @@ common_env.UserInstallTargetHeader('iotivity_debug.h', 'c_common', 'iotivity_deb
common_env.UserInstallTargetHeader('platform_features.h', 'c_common', 'platform_features.h')
Clean(commonlib, config_h_file_path)
env.PrependUnique(LIBS = ['c_common'])
# c_common calls into logger.
env.PrependUnique(LIBS = ['c_common', 'logger'])
......@@ -38,14 +38,10 @@ randomtest_env.PrependUnique(CPPPATH = [
'../../../oc_logger/include',
])
randomtest_env.PrependUnique(LIBS = ['octbstack',
'connectivity_abstraction',
'uuid'])
randomtest_env.PrependUnique(LIBS = ['uuid'])
randomtest_env.PrependUnique(CPPPATH = ['../include'])
randomtest_env.PrependUnique(LIBS = ['c_common'])
if target_os in ['linux']:
randomtest_env.AppendUnique(LIBS = ['m'])
......
......@@ -17,8 +17,6 @@ else:
if env.get('OIC_SUPPORT_TIZEN_TRACE') == 'True':
env.AppendUnique(CPPDEFINES = ['OIC_SUPPORT_TIZEN_TRACE'])
env.PrependUnique(LIBS = ['logger'])
local_env = env.Clone()
######################################################################
......
Markdown is supported
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