Changeset 32631


Ignore:
Timestamp:
2012-07-06T11:23:03+02:00 (6 years ago)
Author:
nbd
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/boost/Makefile

    r32202 r32631  
    186186define Build/Compile 
    187187        ( cd $(PKG_BUILD_DIR) ; \ 
    188                 echo "using gcc : : $(GNU_TARGET_NAME)-gcc : <compileflags>\"$(TARGET_CFLAGS)\" <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/site-config.jam ; \ 
     188                echo "using gcc : $(ARCH) : $(GNU_TARGET_NAME)-gcc : <compileflags>\"$(TARGET_CFLAGS)\" <cxxflags>\"$(TARGET_CXXFLAGS)\" <linkflags>\"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/user-config.jam ; \ 
    189189                $(if $(CONFIG_PACKAGE_boost-python), \ 
    190190                        echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python :     $(STAGING_DIR)/usr/include/python2.7/ ;" >> \ 
    191                                 tools/build/v2/site-config.jam; \ 
     191                                tools/build/v2/user-config.jam; \ 
    192192                ) \ 
    193193                bjam \ 
    194194                        '-sBUILD=release <optimization>space <inlining>on <debug-symbols>off' \ 
    195195                        $(filter -j%,$(PKG_JOBS)) \ 
    196                         --toolset=gcc --build-type=minimal --layout=system \ 
     196                        --toolset=gcc-$(ARCH) --build-type=minimal --layout=system \ 
    197197                        --disable-long-double \ 
    198198                        $(CONFIGURE_ARGS) \ 
Note: See TracChangeset for help on using the changeset viewer.