From ffb5ea4dc30c843eabd7d035bfcc6579c80b6b74 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Fri, 4 Mar 2022 09:17:01 +0100
Subject: [PATCH] make: Fix RPATH in [fz_]archive

---
 cmake/cpp.cmake               | 7 ++++---
 cmake/flatzinc.cmake          | 2 +-
 makefiles/Makefile.archive.mk | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
index b22615698a..3b4ef50eff 100644
--- a/cmake/cpp.cmake
+++ b/cmake/cpp.cmake
@@ -319,7 +319,8 @@ function(add_cxx_sample FILE_NAME)
     set(CMAKE_INSTALL_RPATH
       "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
   elseif(UNIX)
-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
+    set(CMAKE_INSTALL_RPATH
+      "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
   endif()
 
   add_executable(${SAMPLE_NAME} ${FILE_NAME})
@@ -352,7 +353,7 @@ function(add_cxx_example FILE_NAME)
     set(CMAKE_INSTALL_RPATH
       "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
   elseif(UNIX)
-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
   endif()
 
   add_executable(${EXAMPLE_NAME} ${FILE_NAME})
@@ -385,7 +386,7 @@ function(add_cxx_test FILE_NAME)
     set(CMAKE_INSTALL_RPATH
       "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
   elseif(UNIX)
-    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
   endif()
 
   add_executable(${TEST_NAME} ${FILE_NAME})
diff --git a/cmake/flatzinc.cmake b/cmake/flatzinc.cmake
index 19be431c51..82b2fc544e 100644
--- a/cmake/flatzinc.cmake
+++ b/cmake/flatzinc.cmake
@@ -105,7 +105,7 @@ if(APPLE)
   set(CMAKE_INSTALL_RPATH
     "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
 elseif(UNIX)
-  set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN")
+  set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}:$ORIGIN/../lib64:$ORIGIN/../lib:$ORIGIN")
 endif()
 
 
diff --git a/makefiles/Makefile.archive.mk b/makefiles/Makefile.archive.mk
index 666be412c9..726b78e2cd 100644
--- a/makefiles/Makefile.archive.mk
+++ b/makefiles/Makefile.archive.mk
@@ -263,6 +263,7 @@ test_archive: $(INSTALL_DIR)$(ARCHIVE_EXT)
 ifeq ($(SYSTEM),win)
 	$(UNZIP) $< -d $(TEMP_TEST_DIR)
 	cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) \
+ && $(MAKE) MAKEFLAGS= \
  && $(MAKE) MAKEFLAGS= test_cc \
  && $(MAKE) MAKEFLAGS= test_java \
  && $(MAKE) MAKEFLAGS= test_dotnet
@@ -271,6 +272,7 @@ else
 	$(RENAME) lib lib2
 	$(TAR) -xvf $< -C $(TEMP_TEST_DIR)
 	( cd $(TEMP_TEST_DIR)$S$(INSTALL_DIR) \
+ && $(MAKE) MAKEFLAGS= \
  && $(MAKE) MAKEFLAGS= test_cc \
  && $(MAKE) MAKEFLAGS= test_java \
  && $(MAKE) MAKEFLAGS= test_dotnet \