diff options
| author | Tony Theodore <tonyt@logyst.com> | 2014-12-09 10:18:32 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2014-12-09 10:18:52 (GMT) |
| commit | 51089b944dfecf704bc8fa2175318996d1eab87f (patch) | |
| tree | d03f1908c4c42f6b51c1a72a512a6de5b9a86e31 | |
| parent | 7f96b7aa8bb3e6da1d0da6719c60bf9167284cf5 (diff) | |
| download | mxe-51089b944dfecf704bc8fa2175318996d1eab87f.zip mxe-51089b944dfecf704bc8fa2175318996d1eab87f.tar.gz mxe-51089b944dfecf704bc8fa2175318996d1eab87f.tar.bz2 | |
boost: really fix naming convention and removal of previous libs
The `runtime-link` option is redundant as the build will default
to `link`. All the option does is to cause the mangling of
library names and can be removed.
Fixes #573 and #580
| -rw-r--r-- | src/boost.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/boost.mk b/src/boost.mk index 574a628..0c7f6fe 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -20,7 +20,7 @@ endef define $(PKG)_BUILD # old version appears to interfere rm -rf '$(PREFIX)/$(TARGET)/include/boost/' - rm -f "$(PREFIX)/$(TARGET)/lib/libboost*" + rm -f "$(PREFIX)/$(TARGET)/lib/libboost"* # create user-config echo 'using gcc : mxe : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar <ranlib>$(TARGET)-ranlib ;' > '$(1)/user-config.jam' @@ -40,7 +40,6 @@ define $(PKG)_BUILD architecture=x86 \ binary-format=pe \ link=$(if $(BUILD_STATIC),static,shared) \ - runtime-link=$(if $(BUILD_STATIC),static,shared) \ target-os=windows \ threadapi=win32 \ threading=multi \ |