commit 3d1874af59e5dd8c8e0c31892d1bb8d6871b722a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 15 12:25:01 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jun 19 12:30:15 2016 -0700
tree 1bdd62d2c3314ed623b7fe51c9304344800db7c7
parent 6ca6cf74748b5d3a771b914a39c2a4de93a2bd21

build: Adjust order of link flags

The previous order of flags (unintentionally) had `-lboost_log` flag
specified before `-lndn-cxx`.  Incidentally, the order adjustment avoids
a symbol collision between the two libraries that prevented nfd-status
and nfdc from working on Ubuntu 14.04. A proper fix will follow (see #2859).

Change-Id: I68a5d37b013c1bf91b25e707a04ab1f66298a7f4
Refs: #3650

tools/wscript

diff --git a/tools/wscript b/tools/wscript
index 1f99ef6..ee1909e 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -11,7 +11,7 @@
         bld(features=['cxx', 'cxxprogram'],
             target="../bin/%s" % name,
             source=[i] + bld.path.ant_glob(['%s/**/*.cpp' % name]),
-            use='ndn-cxx core-objects LIBRESOLV BOOST'
+            use='core-objects NDN_CXX BOOST LIBRESOLV'
             )
 
     # List all directories files (tool can has multiple .cpp in the directory)
@@ -21,7 +21,7 @@
             bld(features=['cxx', 'cxxprogram'],
                 target="../bin/%s" % name,
                 source=srcFiles,
-                use='ndn-cxx core-objects LIBRESOLV BOOST',
+                use='core-objects NDN_CXX BOOST LIBRESOLV',
                 includes='%s' % name,
                 )
 

wscript

diff --git a/wscript b/wscript
index f174342..206bb2d 100644
--- a/wscript
+++ b/wscript
@@ -181,7 +181,7 @@
         features='cxx pch',
         source=bld.path.ant_glob(['core/**/*.cpp'],
                                  excl=['core/logger*.cpp']),
-        use='version BOOST NDN_CXX LIBRT',
+        use='version NDN_CXX BOOST LIBRT',
         includes='. core',
         export_includes='. core',
         headers='common.hpp',