From aa907fcabcc44784c66b9f7f4df0dd94689dd982 Mon Sep 17 00:00:00 2001 From: nbd Date: Fri, 6 Jul 2012 09:23:03 +0000 Subject: [PATCH] boost: use user-config.jam instead of site-config.jam On some machines the build ignores site-config.jam and proceeds doing a native build. To catch such errors earlier, set the architecture in the gcc toolset git-svn-id: svn://svn.openwrt.org/openwrt/packages@32631 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/boost/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/boost/Makefile b/libs/boost/Makefile index c24603917..d10a52062 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -185,15 +185,15 @@ TARGET_LDFLAGS += -pthread -lrt define Build/Compile ( cd $(PKG_BUILD_DIR) ; \ - echo "using gcc : : $(GNU_TARGET_NAME)-gcc : \"$(TARGET_CFLAGS)\" \"$(TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/site-config.jam ; \ + echo "using gcc : $(ARCH) : $(GNU_TARGET_NAME)-gcc : \"$(TARGET_CFLAGS)\" \"$(TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/user-config.jam ; \ $(if $(CONFIG_PACKAGE_boost-python), \ echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.7/ ;" >> \ - tools/build/v2/site-config.jam; \ + tools/build/v2/user-config.jam; \ ) \ bjam \ '-sBUILD=release space on off' \ $(filter -j%,$(PKG_JOBS)) \ - --toolset=gcc --build-type=minimal --layout=system \ + --toolset=gcc-$(ARCH) --build-type=minimal --layout=system \ --disable-long-double \ $(CONFIGURE_ARGS) \ $(if $(CONFIG_PACKAGE_boost-chrono),,--without-chrono) \