diff options
| author | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-03 12:42:16 +0100 |
|---|---|---|
| committer | Oliver Reiche <oliver.reiche@huawei.com> | 2023-11-20 16:01:56 +0100 |
| commit | 4e86f756bddca8db402502be47c0825e1e2aeb0d (patch) | |
| tree | 2a33472e1ddac9eeaf41869592bc29c773f1d166 | |
| parent | 779354b0f9e37c71d4c2b15b62d4d34d1e610a48 (diff) | |
| download | rules-cc-4e86f756bddca8db402502be47c0825e1e2aeb0d.tar.gz | |
foreign: Do not follow symlinks of tool paths
| -rw-r--r-- | CC/foreign/cmake/EXPRESSIONS | 10 | ||||
| -rw-r--r-- | CC/foreign/make/EXPRESSIONS | 8 | ||||
| -rw-r--r-- | CC/foreign/shell/EXPRESSIONS | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS index a36c706..3d277fe 100644 --- a/CC/foreign/cmake/EXPRESSIONS +++ b/CC/foreign/cmake/EXPRESSIONS @@ -267,11 +267,11 @@ , "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})" + , "export CC=$([ -x \"${CC}\" ] && echo $(pwd)/${CC} || echo ${CC})" + , "export CXX=$([ -x \"${CXX}\" ] && echo $(pwd)/${CXX} || echo ${CXX})" + , "export AR=$([ -x \"${AR}\" ] && echo $(pwd)/${AR} || echo ${AR})" + , "export MAKE=$([ -x \"${MAKE}\" ] && echo $(pwd)/${MAKE} || echo ${MAKE})" + , "export CMAKE=$([ -x \"${CMAKE}\" ] && echo $(pwd)/${CMAKE} || echo ${CMAKE})" , { "type": "join" , "$1": [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " diff --git a/CC/foreign/make/EXPRESSIONS b/CC/foreign/make/EXPRESSIONS index d31a2bb..6a213a7 100644 --- a/CC/foreign/make/EXPRESSIONS +++ b/CC/foreign/make/EXPRESSIONS @@ -245,10 +245,10 @@ , "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})" + , "export CC=$([ -x \"${CC}\" ] && echo $(pwd)/${CC} || echo ${CC})" + , "export CXX=$([ -x \"${CXX}\" ] && echo $(pwd)/${CXX} || echo ${CXX})" + , "export AR=$([ -x \"${AR}\" ] && echo $(pwd)/${AR} || echo ${AR})" + , "export MAKE=$([ -x \"${MAKE}\" ] && echo $(pwd)/${MAKE} || echo ${MAKE})" , { "type": "join" , "$1": [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " diff --git a/CC/foreign/shell/EXPRESSIONS b/CC/foreign/shell/EXPRESSIONS index 2f05497..be6f797 100644 --- a/CC/foreign/shell/EXPRESSIONS +++ b/CC/foreign/shell/EXPRESSIONS @@ -269,11 +269,11 @@ , "export TOOLCHAIN=\"$(pwd)/toolchain\"" , "export LOCALBASE=\"$(pwd)/localbase\"" , "export DESTDIR=\"$(pwd)/install\"" - , "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})" + , "export CC=$([ -x \"${CC}\" ] && echo $(pwd)/${CC} || echo ${CC})" + , "export CXX=$([ -x \"${CXX}\" ] && echo $(pwd)/${CXX} || echo ${CXX})" + , "export AR=$([ -x \"${AR}\" ] && echo $(pwd)/${AR} || echo ${AR})" + , "export MAKE=$([ -x \"${MAKE}\" ] && echo $(pwd)/${MAKE} || echo ${MAKE})" + , "export CMAKE=$([ -x \"${CMAKE}\" ] && echo $(pwd)/${CMAKE} || echo ${CMAKE})" , { "type": "join" , "$1": [ "export PATH=\"$(./expand_exec TOOLCHAIN -- echo " |