ソースを参照

Build only necessary boost stuff and force libstdc++ in benchmarklib.

master
コミット
b92873391d
2個のファイルの変更35行の追加2行の削除
  1. +1
    -1
      benchmarklib/Makefile
  2. +34
    -1
      boost/Makefile

+ 1
- 1
benchmarklib/Makefile ファイルの表示

@@ -16,7 +16,7 @@ impl:
# if [[ -f CMakeCache.txt ]]; then rm CMakeCache.txt; fi
dpkg -i boost/pkg/*.deb
pushd benchmarklib && \
CXX=$$(which c++) cmake -DSTATIC=1 -DBOOST_ROOT=/opt/cppse/build/boost -DCMAKE_INSTALL_PREFIX=$$PWD/benchmarklib_out . && \
CXX=$$(which c++) cmake -DSTATIC=1 -DBOOST_ROOT=/opt/cppse/build/boost -DCMAKE_INSTALL_PREFIX=$$PWD/benchmarklib_out -DNO_AUTO_USE_LIBCPP_CLANG=1 . && \
make -j $$(nproc) && \
make install


+ 34
- 1
boost/Makefile ファイルの表示

@@ -18,7 +18,12 @@ impl:
mkdir -p target && \
CXX=$$(which c++) ./bootstrap.sh --prefix=$$PWD/target/ --with-toolset=clang && \
./b2 clean && \
./b2 --prefix=$$PWD/target/ toolset=clang cxxflags="-D_GLIBCXX_USE_CXX11_ABI=0 -std=c++17" || true
./b2 --prefix=$$PWD/target/ toolset=clang cxxflags="-std=c++17 -stdlib=libstdc++" linkflags="-stdlib=libstdc++" --with-program_options \
--with-system \
--with-date_time \
--with-thread \
--with-chrono || true
# do not use -D_GLIBCXX_USE_CXX11_ABI=0 , other libs I now compile with libstdc++ don't do it either.
# with stdlib: \
#./b2 --prefix=$$PWD/target/ toolset=clang cxxflags="-D_GLIBCXX_USE_CXX11_ABI=0 -stdlib=libc++ -std=c++17" linkflags="-stdlib=libc++" || true
# without:
@@ -26,6 +31,34 @@ impl:
# ^ ||true because with clang I saw a few libraries not compile correctly, we can ignore those.
#./b2 --with-program_options --prefix=$$PWD/target/ toolset=clang cxxflags="-stdlib=libc++ -std=c++17" linkflags="-stdlib=libc++"

# also from; ./b2 --show-libraries && \
#- atomic
#- container
#- context
#- contract
#- coroutine
#- exception
#- fiber
#- filesystem
#- graph
#- graph_parallel
#- headers
#- iostreams
#- locale
#- log
#- math
#- mpi
#- nowide
#- python
#- random
#- regex
#- serialization
#- stacktrace
#- test
#- timer
#- type_erasure
#- wave

package:
rm -rf out
mkdir -p out/opt/cppse/build/boost/include/

読み込み中…
キャンセル
保存