Also use the local cmake binary if available (for trusty) and take in account the PRE_PROCESS_CONF option

This commit is contained in:
Sylvestre Ledru 2018-08-17 12:49:22 +02:00
parent 73e587f73b
commit 0486b90d44
2 changed files with 14 additions and 2 deletions

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ llvm-toolchain-7 (1:7~+rc1-1~exp3) experimental; urgency=medium
* Fixed "weak-library-dev-dependency libc++-7-dev on libc++-7-helpers"
* Fixed "libomp5-7: shlibs-declares-dependency-on-other-package
libomp5-7) (>= 1:7~svn298832-1~)"
* Also use the local cmake binary if available (for trusty)
and take in account the PRE_PROCESS_CONF option
[ Reshabh Sharma ]
* Fixed "Lintian warnings for libc++abi-7-dev package"

14
debian/rules vendored
View File

@ -354,8 +354,13 @@ endif
mkdir -p libcxxabi/build
mkdir -p libcxx/build
CMAKE_BIN=cmake; \
if test -f /tmp/cmake/bin/cmake; then \
CMAKE_BIN=/tmp/cmake/bin/cmake; \
fi; \
echo "Using cmake: $$CMAKE_BIN"; \
cd libcxxabi/build && \
cmake ../ \
$(PRE_PROCESS_CONF) $$CMAKE_BIN ../ \
$(LIBCXX_CMAKE_OPTIONS) \
-DLIBCXXABI_LIBCXX_PATH=$(BASE_PATH)/libcxx \
-DLIBCXXABI_LIBCXX_LIBRARY_PATH=$(BASE_PATH)/libcxx/build/lib \
@ -364,8 +369,13 @@ endif
-DLLVM_ENABLE_RTTI=ON && \
$(MAKE) $(NJOBS) VERBOSE=1
CMAKE_BIN=cmake; \
if test -f /tmp/cmake/bin/cmake; then \
CMAKE_BIN=/tmp/cmake/bin/cmake; \
fi; \
echo "Using cmake: $$CMAKE_BIN"; \
cd libcxx/build && \
cmake ../ \
$(PRE_PROCESS_CONF) $$CMAKE_BIN ../ \
$(LIBCXX_CMAKE_OPTIONS) \
-DLIBCXX_CXX_ABI=libcxxabi \
-DLIBCXX_CXX_ABI_INCLUDE_PATHS=$(BASE_PATH)/libcxxabi/include \