Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kpu/kenlm.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Heafield <github@kheafield.com>2014-04-08 19:53:41 +0400
committerKenneth Heafield <github@kheafield.com>2014-04-08 19:53:41 +0400
commit22ec022ce949f1438da61b895cbe909e290ceca2 (patch)
treea3aa6259d03e0556f81d36036d6a4967ccf3c6b4
parent2edf319dd54ebb2bbcdaec258a0c46346b43059e (diff)
Undo boost_exception dependency. User reported other problems may be the cause (subtle g++ ABI
incompatabilities)
-rw-r--r--jam-files/sanity.jam9
1 files changed, 5 insertions, 4 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index bc07945..4007fdd 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -169,11 +169,12 @@ rule boost ( min-version ) {
#Are we linking static binaries against shared boost?
boost-auto-shared = [ auto-shared "boost_program_options"$(boost-lib-version) : $(L-boost-search) ] ;
- #See tools/build/v2/contrib/boost.jam in a boost distribution for a table of macros to define.
- boost-lib exception EXCEPTION_DYN_LINK ;
+ #See tools/build/v2/contrib/boost.jam in a boost distribution for a table of macros to define.
+ #boost_exception is static only and may not be needed just yet.
+ #boost-lib exception EXCEPTION_DYN_LINK ;
boost-lib system SYSTEM_DYN_LINK ;
- boost-lib thread THREAD_DYN_DLL : boost_system boost_exception ;
- boost-lib program_options PROGRAM_OPTIONS_DYN_LINK : boost_exception ;
+ boost-lib thread THREAD_DYN_DLL : boost_system ;
+ boost-lib program_options PROGRAM_OPTIONS_DYN_LINK ;
boost-lib unit_test_framework TEST_DYN_LINK ;
boost-lib iostreams IOSTREAMS_DYN_LINK ;
boost-lib filesystem FILE_SYSTEM_DYN_LINK ;