diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2012-10-16 00:35:56 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2012-10-16 00:35:56 +0400 |
| commit | 365e68011521fee9d9e8f22801e58891c5fa5f0b (patch) | |
| tree | eb6bff09b5b0e2763f1ffef2f04d6a79ed568221 /jam-files | |
| parent | 61ae24aa5d1db2c117c1aa90ca65ef4fe41490fa (diff) | |
| parent | 0eb98df0fe32a8e31188fa107f789afd73d81ccf (diff) | |
Merge remote-tracking branch 'origin/master' into miramerge
NB Untested
Conflicts:
Jamroot
moses-chart-cmd/src/Main.cpp
moses/src/ChartManager.cpp
moses/src/RuleTable/LoaderStandard.cpp
moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
moses/src/Word.cpp
Diffstat (limited to 'jam-files')
| -rw-r--r-- | jam-files/sanity.jam | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index c8435862c..ab126c9fb 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -63,7 +63,7 @@ requirements = ; FORCE-STATIC = [ option.get "static" : : "yes" ] ; if $(FORCE-STATIC) { - requirements += <runtime-link>static ; + requirements += <link>static <runtime-link>static ; } #Determine if a library can be compiled statically. @@ -260,3 +260,5 @@ if [ option.get "sanity-test" : : "yes" ] { EXIT "Bad" : 1 ; } } + +use-project /top : . ; |