On some arch, we need another version of cmake. in some case, it needs a specific version of the lib. So, provide the ld_library_path for these

This commit is contained in:
Sylvestre Ledru 2021-03-27 12:18:31 +01:00
parent 99609f8c8c
commit b528e61bff

5
debian/rules vendored
View File

@ -417,6 +417,9 @@ VERBOSE=VERBOSE=1
#VERBOSE=-v #VERBOSE=-v
debian-full-build: debian-full-build:
if test -f /tmp/cmake/bin/cmake; then \
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \
fi; \
$(PRE_PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CFLAGS="$(CFLAGS_EXTRA)" CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 $(BUILD_METHOD) $(PRE_PROCESS) make $(NJOBS) -C $(TARGET_BUILD) $(VERBOSE) CFLAGS="$(CFLAGS_EXTRA)" CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 $(BUILD_METHOD)
# Check the stage 2 build worked # Check the stage 2 build worked
@ -472,6 +475,7 @@ debian-libcxx-build:
CMAKE_BIN=cmake; \ CMAKE_BIN=cmake; \
if test -f /tmp/cmake/bin/cmake; then \ if test -f /tmp/cmake/bin/cmake; then \
CMAKE_BIN=/tmp/cmake/bin/cmake; \ CMAKE_BIN=/tmp/cmake/bin/cmake; \
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \
fi; \ fi; \
echo "Using cmake: $$CMAKE_BIN"; \ echo "Using cmake: $$CMAKE_BIN"; \
cd libcxxabi/build && \ cd libcxxabi/build && \
@ -493,6 +497,7 @@ debian-libcxxabi-build:
CMAKE_BIN=cmake; \ CMAKE_BIN=cmake; \
if test -f /tmp/cmake/bin/cmake; then \ if test -f /tmp/cmake/bin/cmake; then \
CMAKE_BIN=/tmp/cmake/bin/cmake; \ CMAKE_BIN=/tmp/cmake/bin/cmake; \
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \
fi; \ fi; \
echo "Using cmake: $$CMAKE_BIN"; \ echo "Using cmake: $$CMAKE_BIN"; \
cd libcxx/build && \ cd libcxx/build && \