瀏覽代碼

Update CAF to newer version and make it use libstdc++ explicitly

master
Ray Burgemeestre 5 年之前
父節點
當前提交
85b319f856
共有 1 個檔案被更改,包括 15 行新增15 行删除
  1. +15
    -15
      caf/Makefile

+ 15
- 15
caf/Makefile 查看文件

@@ -2,7 +2,7 @@ SHELL:=/bin/bash

caf:
git clone https://github.com/actor-framework/actor-framework
pushd actor-framework && git checkout 0.17.3
pushd actor-framework && git checkout 6bbe993f315eaa7c8264bc9ae240766b05e64513 # master at the time of writing
bash ../ubuntu1804.sh make impl
make package

@@ -13,22 +13,22 @@ impl:
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 40
update-alternatives --install /usr/bin/ld ld /usr/bin/ld.lld-10 40
pushd actor-framework && \
./configure --prefix=$$PWD/caf_out --with-clang=$$(which c++) --build-static-only \
--no-examples \
--no-unit-tests \
--no-tools \
--no-python && \
pushd build && \
CXX="$(which c++)" ./configure --cxx-flags="-stdlib=libstdc++" --disable-shared-libs --prefix=$$PWD/caf_out && \
echo patch CMakeLists.txt ../caf-cmakefile.patch && \
mkdir -p build && \
cmake \
-DCMAKE_INSTALL_PREFIX=$$PWD/caf_out \
-DCAF_BUILD_STATIC=yes \
-DCAF_BUILD_STATIC_ONLY=yes \
-DCAF_NO_EXAMPLES=yes \
-DCAF_NO_UNIT_TESTS=yes \
.. && \
make -j $$(nproc) && \
pushd build && \
cmake -DCMAKE_INSTALL_PREFIX=$$PWD/caf_out .. && \
DO_NOT_SPECIFY_CMAKE_CXX_FLAGS_HERE="" make -j $$(nproc) && \
make install

# works: CXX="$(which c++)" ./configure --cxx-flags="-stdlib=libc++" --disable-shared-libs --prefix=$$PWD/caf_out && \
# changed to libstdc++ (the gnu version)
# until my question is answered here: https://groups.google.com/forum/#!topic/v8-users/Do5MvAvYFgs
# i will not use libc++
#

# was: CMAKE_CXX_FLAGS="-std=c++17 -stdlib=libc++" make -j $$(nproc) && \
# CMAKE_CXX_FLAGS="-std=c++17 -stdlib=libc++ -DGLIBCXX_USE_CXX11_ABI=1 -D_GLIBCXX_USE_CXX11_ABI=1" make -j $$(nproc) && \
#-DCAF_NO_AUTO_LIBCPP=yes \
#GLIBCXX_USE_CXX11_ABI=1 CMAKE_CXX_FLAGS="-std=c++17 -stdlib=libc++" make -j $$(nproc) && \
#make install

Loading…
取消
儲存