Update to use project specific bjam config instead of overriding bjam…

… user config
won21kr · Nov 29, 2018 · 330febe · 330febe
1 parent 2f4897a
commit 330febe
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
@@ -103,7 +103,7 @@ else
       --prefix=../boost-install \
       --with-libraries=python,filesystem \
       --with-python=${py2} --with-python-root=${py2_root}
-  echo "using python : ${pyv} : ${py2_root}/bin/python2 ;" > ${HOME}/user-config.jam
+  echo "using python : ${pyv} : ${py2_root}/bin/python2 ;" > project-config.jam
   ./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} stage release
   ./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} install
   ./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} --clean-all
@@ -124,7 +124,7 @@ else
       --prefix=../boost-install \
       --with-libraries=python \
       --with-python=${py3} --with-python-root=${py3_root}
-  echo "using python : ${pyv} : ${py3_root}/bin/python3 ;" > ${HOME}/user-config.jam
+  echo "using python : ${pyv} : ${py3_root}/bin/python3 ;" > project-config.jam
   ./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} stage release
   ./b2 toolset="${BOOST_TOOLSET}" cxxflags="${BOOST_CFLAGS}" --prefix="../${BOOST_BASENAME}-install" -j ${CARLA_BUILD_CONCURRENCY} install