diff options
| author | Kenneth Heafield <github@kheafield.com> | 2012-10-04 18:17:23 +0400 |
|---|---|---|
| committer | Kenneth Heafield <github@kheafield.com> | 2012-10-04 18:17:23 +0400 |
| commit | e3af51f3a44de52e5074e7c709e8387afe9f052f (patch) | |
| tree | 79245585282f68a935a7d22712660901d1cb88b2 /jam-files | |
| parent | 92d19401dca34e9058cbbd48dc560988956d62fe (diff) | |
| parent | 9ae55243e25560338095c5e87e191f22019625de (diff) | |
Merge remote branch 'upstream/master'
Conflicts:
jam-files/sanity.jam
Diffstat (limited to 'jam-files')
| -rw-r--r-- | jam-files/sanity.jam | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam index e15a92dbc..ed4c38d2e 100644 --- a/jam-files/sanity.jam +++ b/jam-files/sanity.jam @@ -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 ; } #Link normally to a library, but sometimes static isn't installed so fall back to dynamic. |