fix doozer script for macos

This commit is contained in:
arvidn 2018-08-11 22:30:21 +02:00 committed by Arvid Norberg
parent d55200af9d
commit e229a36001
2 changed files with 4 additions and 6 deletions

View File

@ -16,13 +16,12 @@
"buildenv": "osx", "buildenv": "osx",
"homebrew": { "formulae": ["boost-build", "wget", "ccache"] }, "homebrew": { "formulae": ["boost-build", "wget", "ccache"] },
"buildcmd": [ "buildcmd": [
"wget --quiet -O boost.zip https://dl.bintray.com/boostorg/release/1.67.0/source/boost_1_67_0.zip", "wget --quiet -O boost.zip https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.zip",
"unzip -qq boost.zip", "unzip -qq boost.zip",
"cd boost_1_67_0/tools/build/engine", "(cd boost_1_68_0/tools/build/src/engine && ./build.sh)",
"./build.sh", "cd simulation",
"cd ../../../../simulation",
"echo \"using darwin : : ccache clang++ : <cxxflags>-std=c++11 ;\" > ~/user-config.jam", "echo \"using darwin : : ccache clang++ : <cxxflags>-std=c++11 ;\" > ~/user-config.jam",
"BOOST_ROOT=${PWD}/../boost_1_67_0 ../boost_1_67_0/tools/build/engine/bin.macosx64/bjam --hash -j${PARALLEL}" "BOOST_ROOT=${PWD}/../boost_1_68_0 ../boost_1_68_0/tools/build/src/engine/bin.macosxx86_64/bjam --hash -j${PARALLEL}"
] ]
} }
} }

View File

@ -508,7 +508,6 @@ feature.compose <debug-iterators>off : <define>_ITERATOR_DEBUG_LEVEL=0 ;
feature fpic : off on : composite propagated link-incompatible ; feature fpic : off on : composite propagated link-incompatible ;
feature.compose <fpic>on : <cflags>-fPIC ; feature.compose <fpic>on : <cflags>-fPIC ;
feature.compose <fpic>off : <toolset>darwin:<cflags>-mdynamic-no-pic ;
feature profile-calls : off on : composite propagated link-incompatible ; feature profile-calls : off on : composite propagated link-incompatible ;
feature.compose <profile-calls>on : <define>TORRENT_PROFILE_CALLS=1 ; feature.compose <profile-calls>on : <define>TORRENT_PROFILE_CALLS=1 ;