diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2012-10-08 20:54:59 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2012-10-08 20:54:59 +0400 |
| commit | 848aafb64478f843e25a800c57243b38609465ef (patch) | |
| tree | be3dce6647a1a300b48ccbd32b36dc65b56c998f /jam-files | |
| parent | e7e4dbd405e8d29a9a429c6b5eb366a2fe0ecf9a (diff) | |
| parent | 2aa10c3012328d8fd66ceee26c25e3d8771f9f31 (diff) | |
Merge remote branch 'github/master' into miramerge
Conflicts:
moses/src/AlignmentInfo.cpp
moses/src/AlignmentInfo.h
moses/src/ChartHypothesis.cpp
moses/src/ChartTrellisNode.cpp
moses/src/LM/Implementation.cpp
moses/src/LM/Ken.cpp
moses/src/TargetPhrase.cpp
moses/src/TargetPhrase.h
Diffstat (limited to 'jam-files')
| -rw-r--r-- | jam-files/sanity.jam | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index 6beec3f94..c8435862c 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -29,7 +29,7 @@ ldflags = [ os.environ "LDFLAGS" ] ; #Run g++ with empty main and these arguments to see if it passes. rule test_flags ( flags * ) { flags = $(cxxflags) $(ldflags) $(flags) ; - local cmd = "bash -c \"g++ "$(flags:J=" ")" -x c++ - <<<'int main() {}' -o /dev/null >/dev/null 2>/dev/null\"" ; + local cmd = "bash -c \"g++ "$(flags:J=" ")" -x c++ - <<<'int main() {}' -o $(TOP)/dummy >/dev/null 2>/dev/null && rm $(TOP)/dummy 2>/dev/null\"" ; local ret = [ SHELL $(cmd) : exit-status ] ; if --debug-configuration in [ modules.peek : ARGV ] { echo $(cmd) ; @@ -152,7 +152,6 @@ rule boost ( min-version ) { 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 : boost_system ; } #Link normally to a library, but sometimes static isn't installed so fall back to dynamic. |