From 51089b944dfecf704bc8fa2175318996d1eab87f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 9 Dec 2014 21:18:32 +1100 Subject: 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 --- src/boost.mk | 3 +-- 1 file changed, 1 insertion(+), 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++ : $(TARGET)-windres $(TARGET)-ar $(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 \ -- cgit v0.12