From a86faea94836af1faf0a1392e6d5c6bd967ffdcd Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Mon, 15 May 2023 11:28:38 +0200
Subject: rules-cc/foreign: Set rpath

---
 CC/foreign/cmake/EXPRESSIONS | 1 +
 CC/foreign/make/EXPRESSIONS  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'CC')

diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS
index 53d6497..4c21f4b 100644
--- a/CC/foreign/cmake/EXPRESSIONS
+++ b/CC/foreign/cmake/EXPRESSIONS
@@ -61,6 +61,7 @@
               , "cond": {"type": "var", "name": "BUILD_POSITION_INDEPENDENT"}
               , "then": ["-DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
               }
+            , ["-DCMAKE_INSTALL_RPATH=$ORIGIN;$ORIGIN/../lib"]
             ]
           }
         ]
diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS
index fb85101..df2f98f 100644
--- a/CC/foreign/make/EXPRESSIONS
+++ b/CC/foreign/make/EXPRESSIONS
@@ -77,7 +77,8 @@
           , "$1":
             { "type": "++"
             , "$1":
-              [ { "type": "var"
+              [ ["-Wl,-rpath,$ORIGIN", "-Wl,-rpath,$ORIGIN/../lib"]
+              , { "type": "var"
                 , "name": "LDFLAGS"
                 , "default":
                   {"type": "CALL_EXPRESSION", "name": "default-LDFLAGS"}
-- 
cgit v1.2.3