Fix linking of liboctbstack: conectivity_abstraction requires coap

The order in which static libraries are listed matters, so
connectivity_abstraction needs to appear before coap.

This also solves the problem on iOS that caused libcoap to be moved to
later.

Change-Id: I0d4913955e3745b69672ffff13dbc5d38a438ef6
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/920
Reviewed-by: Charlie Lenahan <charlie.lenahan@intel.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Caiwen Zhang <caiwen.zhang@intel.com>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript
index 27a8393..5004f84 100644 (file)
--- a/resource/csdk/SConscript
+++ b/resource/csdk/SConscript
@@ -62,6 +62,9 @@ if target_os not in ['windows', 'winrt']:
        liboctbstack_env.AppendUnique(CFLAGS = ['-Wall'])
 
 liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+
+if target_os in ['android', 'linux']:
+       liboctbstack_env.AppendUnique(LIBS = ['connectivity_abstraction'])
 liboctbstack_env.AppendUnique(LIBS = ['coap', 'm'])
 
 if target_os not in ['android', 'arduino', 'windows', 'winrt']:
@@ -71,12 +74,9 @@ if target_os == 'arduino':
        liboctbstack_env.AppendUnique(CPPDEFINES = ['NDEBUG', 'WITH_ARDUINO'])
 elif target_os not in ['darwin','ios']:
        liboctbstack_env.AppendUnique(CFLAGS = ['-fPIC'])
-if target_os in ['android', 'linux']:
-       liboctbstack_env.AppendUnique(LIBS = ['connectivity_abstraction'])
 if target_os in ['darwin', 'ios']:
        liboctbstack_env.AppendUnique(CPPDEFINES = ['_DARWIN_C_SOURCE'])
        liboctbstack_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
-       liboctbstack_env.AppendUnique(LIBS = ['coap'])
 
 if env.get('SECURED') == '1':
        liboctbstack_env.AppendUnique(LIBS = ['tinydtls'])