summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth Heafield <github@kheafield.com>2012-09-13 06:36:28 -0700
committerKenneth Heafield <github@kheafield.com>2012-09-13 06:36:28 -0700
commitb901df059531aad2f7d11b1e1ce13f9a9cb1c8ef (patch)
tree5e0ca4c8ebbea50c35c1f20fb2bf0752c96bc575
parentdf001c7fb050bf5e424af4a0948ae7e23486fc06 (diff)
Fix compilation with static
-rw-r--r--dpmert/Jamfile4
-rw-r--r--jam-files/sanity.jam2
-rw-r--r--mira/Jamfile2
3 files changed, 4 insertions, 4 deletions
diff --git a/dpmert/Jamfile b/dpmert/Jamfile
index 647caac8..6f6a3d40 100644
--- a/dpmert/Jamfile
+++ b/dpmert/Jamfile
@@ -9,14 +9,14 @@ lib dpmert :
mert_geometry.cc
..//utils
..//mteval
- ..//decoder
+ ../decoder//decoder
../klm/lm//kenlm
..//boost_program_options
: <include>.
: :
<library>..//utils
<library>..//mteval
- <library>..//decoder
+ <library>../decoder//decoder
<library>../klm/lm//kenlm
<library>..//boost_program_options
<include>.
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 086f20ae..738316f8 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.
diff --git a/mira/Jamfile b/mira/Jamfile
index 8825b887..a483e57d 100644
--- a/mira/Jamfile
+++ b/mira/Jamfile
@@ -1 +1 @@
-exe kbest_mira : kbest_mira.cc ..//decoder ;
+exe kbest_mira : kbest_mira.cc ../decoder//decoder ;