From aa079bbb57c26abafb29dde57508b3ce9d0567b6 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Fri, 27 Sep 2024 14:30:39 +0200 Subject: clang: use provided ${CMAKE} variable ... instead of hard-coding the name cmake. --- src/compilers/clang-16-native.TARGETS | 8 ++++---- src/compilers/clang-17-native.TARGETS | 8 ++++---- src/compilers/clang-18-native.TARGETS | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/compilers/clang-16-native.TARGETS b/src/compilers/clang-16-native.TARGETS index 7c9b3d2..e19e4de 100644 --- a/src/compilers/clang-16-native.TARGETS +++ b/src/compilers/clang-16-native.TARGETS @@ -136,7 +136,7 @@ , { "type": "join" , "separator": " " , "$1": - [ "cmake" + [ "${CMAKE}" , "-B" , "build" , "-S" @@ -189,10 +189,10 @@ , ">configure.log 2>&1 || (cat configure.log && exit 1)" ] } - , "cmake --build build --target clang -j${NJOBS} >build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target clang -j${NJOBS} >build.log 2>&1 || (cat configure.log build.log && exit 1)" , "export LDFLAGS=\"--gcc-toolchain=${GCC_TOOLCHAIN} ${LINK_ARGS}\"" - , "cmake --build build --target all -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" - , "cmake --build build --target install -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target all -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target install -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" , "cd ${DESTDIR}" , "strip ./bin/* 2>/dev/null || true" , "find . -type f -name '*.so*' -exec sh -c \"strip {} 2>/dev/null\" \\;" diff --git a/src/compilers/clang-17-native.TARGETS b/src/compilers/clang-17-native.TARGETS index 5479472..78b2bd4 100644 --- a/src/compilers/clang-17-native.TARGETS +++ b/src/compilers/clang-17-native.TARGETS @@ -136,7 +136,7 @@ , { "type": "join" , "separator": " " , "$1": - [ "cmake" + [ "${CMAKE}" , "-B" , "build" , "-S" @@ -189,10 +189,10 @@ , ">configure.log 2>&1 || (cat configure.log && exit 1)" ] } - , "cmake --build build --target clang -j${NJOBS} >build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target clang -j${NJOBS} >build.log 2>&1 || (cat configure.log build.log && exit 1)" , "export LDFLAGS=\"--gcc-toolchain=${GCC_TOOLCHAIN} ${LINK_ARGS}\"" - , "cmake --build build --target all -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" - , "cmake --build build --target install -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target all -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target install -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" , "cd ${DESTDIR}" , "strip ./bin/* 2>/dev/null || true" , "find . -type f -name '*.so*' -exec sh -c \"strip {} 2>/dev/null\" \\;" diff --git a/src/compilers/clang-18-native.TARGETS b/src/compilers/clang-18-native.TARGETS index 3a97f30..aeb4cc7 100644 --- a/src/compilers/clang-18-native.TARGETS +++ b/src/compilers/clang-18-native.TARGETS @@ -136,7 +136,7 @@ , { "type": "join" , "separator": " " , "$1": - [ "cmake" + [ "${CMAKE}" , "-B" , "build" , "-S" @@ -189,10 +189,10 @@ , ">configure.log 2>&1 || (cat configure.log && exit 1)" ] } - , "cmake --build build --target clang -j${NJOBS} >build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target clang -j${NJOBS} >build.log 2>&1 || (cat configure.log build.log && exit 1)" , "export LDFLAGS=\"--gcc-toolchain=${GCC_TOOLCHAIN} ${LINK_ARGS}\"" - , "cmake --build build --target all -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" - , "cmake --build build --target install -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target all -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" + , "${CMAKE} --build build --target install -j${NJOBS} >>build.log 2>&1 || (cat configure.log build.log && exit 1)" , "cd ${DESTDIR}" , "strip ./bin/* 2>/dev/null || true" , "find . -type f -name '*.so*' -exec sh -c \"strip {} 2>/dev/null\" \\;" -- cgit v1.2.3