summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-07-05 09:45:04 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-08-25 17:09:28 +0200
commit6094651fe7f5fe3fc93899011b8ef8dd3fd61a58 (patch)
treea5609745deb693cd3f39cc8be38c1827c86bb633
parentc9e2db5ba96afee9224ef173a8b2110d3a99a23d (diff)
downloadrules-cc-6094651fe7f5fe3fc93899011b8ef8dd3fd61a58.tar.gz
foreign: Fix resolve abs path of build tools
-rw-r--r--CC/foreign/cmake/EXPRESSIONS3
-rw-r--r--CC/foreign/make/EXPRESSIONS3
2 files changed, 6 insertions, 0 deletions
diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS
index 9956bda..6865e7c 100644
--- a/CC/foreign/cmake/EXPRESSIONS
+++ b/CC/foreign/cmake/EXPRESSIONS
@@ -270,6 +270,9 @@
, "export TMPDIR=\"$(pwd)/scratch\""
, "export TOOLCHAIN=\"$(pwd)/toolchain\""
, "export LOCALBASE=\"$(pwd)/localbase\""
+ , "export CC=$([ -x \"${CC}\" ] && realpath ${CC} || echo ${CC})"
+ , "export CXX=$([ -x \"${CXX}\" ] && realpath ${CXX} || echo ${CXX})"
+ , "export AR=$([ -x \"${AR}\" ] && realpath ${AR} || echo ${AR})"
, "export MAKE=$([ -x \"${MAKE}\" ] && realpath ${MAKE} || echo ${MAKE})"
, "export CMAKE=$([ -x \"${CMAKE}\" ] && realpath ${CMAKE} || echo ${CMAKE})"
, { "type": "join"
diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS
index bf72594..aeafbfc 100644
--- a/CC/foreign/make/EXPRESSIONS
+++ b/CC/foreign/make/EXPRESSIONS
@@ -248,6 +248,9 @@
, "export DESTDIR=\"$(pwd)/install\""
, "export TOOLCHAIN=\"$(pwd)/toolchain\""
, "export LOCALBASE=\"$(pwd)/localbase\""
+ , "export CC=$([ -x \"${CC}\" ] && realpath ${CC} || echo ${CC})"
+ , "export CXX=$([ -x \"${CXX}\" ] && realpath ${CXX} || echo ${CXX})"
+ , "export AR=$([ -x \"${AR}\" ] && realpath ${AR} || echo ${AR})"
, "export MAKE=$([ -x \"${MAKE}\" ] && realpath ${MAKE} || echo ${MAKE})"
, { "type": "join"
, "$1":