Merge remote-tracking branch 'origin/7' into snapshot

This commit is contained in:
Sylvestre Ledru 2018-09-06 23:30:13 +02:00
commit 30cfee7c7b

4
debian/rules vendored
View File

@ -375,7 +375,7 @@ endif
-DLIBCXXABI_LIBCXX_INCLUDES=$(BASE_PATH)/libcxx/include \ -DLIBCXXABI_LIBCXX_INCLUDES=$(BASE_PATH)/libcxx/include \
-DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ -DLIBCXXABI_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
-DLLVM_ENABLE_RTTI=ON && \ -DLLVM_ENABLE_RTTI=ON && \
$(MAKE) $(NJOBS) VERBOSE=1 $(PRE_PROCESS_CONF) $(MAKE) $(NJOBS) VERBOSE=1 CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)"
CMAKE_BIN=cmake; \ CMAKE_BIN=cmake; \
if test -f /tmp/cmake/bin/cmake; then \ if test -f /tmp/cmake/bin/cmake; then \
@ -390,7 +390,7 @@ endif
-DLIBCXX_CXX_ABI_LIBRARY_PATH=$(BASE_PATH)/libcxxabi/build/lib \ -DLIBCXX_CXX_ABI_LIBRARY_PATH=$(BASE_PATH)/libcxxabi/build/lib \
-DLIBCXX_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \ -DLIBCXX_ENABLE_EXCEPTIONS=$(LIBCXX_EXCEPTIONS) \
-DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON && \ -DLIBCXX_INSTALL_EXPERIMENTAL_LIBRARY=ON && \
$(MAKE) $(NJOBS) VERBOSE=1 $(PRE_PROCESS_CONF) $(MAKE) $(NJOBS) VERBOSE=1 CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)"
override_dh_prep: build_doc override_dh_prep: build_doc
dh_prep dh_prep