diff options
| author | Ulrich Germann <ulrich.germann@gmail.com> | 2015-04-05 17:51:50 +0300 |
|---|---|---|
| committer | Ulrich Germann <ulrich.germann@gmail.com> | 2015-04-05 17:51:50 +0300 |
| commit | 3e2f878576880e4ae33d3f8e8d63ae989e76fc47 (patch) | |
| tree | 2bee6e9e82b3bb3fc6926b2fef98497447d4d776 /Jamroot | |
| parent | 34776c5e7cf0806d3a8b1d5725d87a9d573d4635 (diff) | |
| parent | 02185a85fb5f78cf99228e034dc62f02c488dc8f (diff) | |
Merge branch 'master' into mmt-dev
Conflicts:
Jamroot
moses/TranslationModel/UG/mmsapt.h
Diffstat (limited to 'Jamroot')
| -rw-r--r-- | Jamroot | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -106,9 +106,8 @@ if ! [ option.get "max-kenlm-order" ] boost 104400 ; external-lib z ; -lib dl : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ; -# lib dl : : <link>static ; -requirements += <library>dl ; +#lib dl : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ; +#requirements += <library>dl ; if ! [ option.get "without-tcmalloc" : : "yes" ] && [ test_library "tcmalloc_minimal" ] { |