From b528e61bff7e9c9903162539bbe0ec74eb0adb01 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 27 Mar 2021 12:18:31 +0100 Subject: [PATCH] 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 --- debian/rules | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/rules b/debian/rules index c637dd20..a3739287 100755 --- a/debian/rules +++ b/debian/rules @@ -417,6 +417,9 @@ VERBOSE=VERBOSE=1 #VERBOSE=-v 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) # Check the stage 2 build worked @@ -472,6 +475,7 @@ debian-libcxx-build: CMAKE_BIN=cmake; \ if test -f /tmp/cmake/bin/cmake; then \ CMAKE_BIN=/tmp/cmake/bin/cmake; \ + export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \ fi; \ echo "Using cmake: $$CMAKE_BIN"; \ cd libcxxabi/build && \ @@ -493,6 +497,7 @@ debian-libcxxabi-build: CMAKE_BIN=cmake; \ if test -f /tmp/cmake/bin/cmake; then \ CMAKE_BIN=/tmp/cmake/bin/cmake; \ + export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/tmp/cmake/bin/; \ fi; \ echo "Using cmake: $$CMAKE_BIN"; \ cd libcxx/build && \