]> git.ipfire.org Git - thirdparty/xz.git/commitdiff
CI: Let CMake use the CC environment variable
authorLasse Collin <lasse.collin@tukaani.org>
Mon, 24 Jun 2024 11:54:17 +0000 (14:54 +0300)
committerLasse Collin <lasse.collin@tukaani.org>
Fri, 6 Sep 2024 16:15:14 +0000 (19:15 +0300)
CC from environment is used to initialize CMAKE_C_COMPILER so
setting CMAKE_C_COMPILER explicitly isn't needed.

The syntax in ci_build.bash was broken in case one wished to put
spaces in CC.

(cherry picked from commit 0c1e6d900bac127464fb30a854776e1810ab5f16)

build-aux/ci_build.bash

index 50e98f4cc08d9df6b0988c1b194967079668d01e..8e7b2d5d2c8063e400dcff682afa177c96679ea5 100755 (executable)
@@ -242,10 +242,6 @@ then
 
                add_extra_option "$SMALL" "-DHAVE_SMALL=ON" ""
 
-               if test -n "$CC" ; then
-                       EXTRA_OPTIONS="$EXTRA_OPTIONS -DCMAKE_C_COMPILER=$CC"
-               fi
-
                # Remove old cache file to clear previous settings.
                rm -f "CMakeCache.txt"
                cmake "$SRC_DIR/CMakeLists.txt" -B "$DEST_DIR" $EXTRA_OPTIONS -DADDITIONAL_CHECK_TYPES="$CHECK_TYPE" -G "Unix Makefiles"