diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-15 11:28:38 +0200 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-05-30 15:33:18 +0200 |
| commit | a86faea94836af1faf0a1392e6d5c6bd967ffdcd (patch) | |
| tree | 40752ae711b443842825cf9eaec396ecd4dc5dff | |
| parent | 0073a9c1c9c67ee6fe0fd064b6354bbd11bba50f (diff) | |
| download | rules-cc-a86faea94836af1faf0a1392e6d5c6bd967ffdcd.tar.gz | |
rules-cc/foreign: Set rpath
| -rw-r--r-- | CC/foreign/cmake/EXPRESSIONS | 1 | ||||
| -rw-r--r-- | CC/foreign/make/EXPRESSIONS | 3 |
2 files changed, 3 insertions, 1 deletions
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"} |