diff --git a/.doozer.json b/.doozer.json index d39048d91..6d5f7db14 100644 --- a/.doozer.json +++ b/.doozer.json @@ -16,13 +16,12 @@ "buildenv": "osx", "homebrew": { "formulae": ["boost-build", "wget", "ccache"] }, "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", - "cd boost_1_67_0/tools/build/engine", - "./build.sh", - "cd ../../../../simulation", + "(cd boost_1_68_0/tools/build/src/engine && ./build.sh)", + "cd simulation", "echo \"using darwin : : ccache clang++ : -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}" ] } } diff --git a/Jamfile b/Jamfile index 6eca252e7..d0828b7e4 100644 --- a/Jamfile +++ b/Jamfile @@ -508,7 +508,6 @@ feature.compose off : _ITERATOR_DEBUG_LEVEL=0 ; feature fpic : off on : composite propagated link-incompatible ; feature.compose on : -fPIC ; -feature.compose off : darwin:-mdynamic-no-pic ; feature profile-calls : off on : composite propagated link-incompatible ; feature.compose on : TORRENT_PROFILE_CALLS=1 ;