Fix dns build issues by re-ordering linked libraries as appropriate

Change-Id: Ide67443cc0d4085ade6fe3137a4e917dbd82f566 Partial-Bug: #1576437
Juniper · Jul 28, 2016 · 553ba0e · 553ba0e
1 parent 4a6fe9b
commit 553ba0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/dns/SConscript b/src/dns/SConscript
@@ -22,14 +22,14 @@ env.Prepend(CPPPATH = env['TOP'] + '/discovery/client')
 env.Prepend(CPPPATH = env['TOP'] + '/http/client')
 
 env.Prepend(LIBS=['ifmap_vnc', 'ifmap_server', 'ifmap_common', 'net', 'ifmapio',
-                  'xmpp', 'ds', 'sandeshvns', 'sandesh', 'peer_sandesh', 'table_sandesh',
-                  'httpc', 'http', 'http_parser', 'curl', 'process_info',
+                  'xmpp', 'ds', 'sandeshvns', 'peer_sandesh', 'table_sandesh',
+                  'httpc', 'curl', 'process_info',
                   'db', 'io', 'base', 'xml', 'pugixml', 'libxml2',
                   'boost_regex', 'boost_chrono', 'boost_program_options',
                   'crypto', 'ssl',
                   'boost_filesystem'])
-
 env.Prepend(LIBS=['dns_cfg', 'cmn', 'mgr', 'agent_xmpp', 'bind_interface', 'dns_uve'])
+env.Append(LIBS=['sandesh', 'http', 'http_parser'])
 
 if sys.platform != 'darwin':
     env.Append(LIBS=['rt'])

diff --git a/src/dns/test/SConscript b/src/dns/test/SConscript
@@ -30,12 +30,12 @@ env.Prepend(LIBS = ['dbtest', 'ifmap_vnc', 'task_test',
                     'pugixml', 'curl', 'net',
                     'ifmap_test_util', 'ifmap_test_util_server',
                     'ifmap_server', 'ifmap_common',
-                    'ifmapio', 'crypto', 'ssl',
-                    'sandesh', 'http', 'http_parser', 'process_info',
-                    'db', 'sandeshvns', 'io', 'base', 'xml', 
+                    'ifmapio', 'crypto', 'ssl', 'process_info',
+                    'db', 'sandeshvns', 'io', 'base', 'xml',
                     'boost_regex', 'boost_program_options', 'gunit'])
 
 env.Prepend(LIBS=['dns_cfg', 'cmn', 'mgr', 'agent_xmpp', 'bind_interface'])
+env.Append(LIBS=['sandesh', 'http', 'http_parser'])
 
 if sys.platform != 'darwin':
     env.Prepend(LINKFLAGS =