mirror of https://git.tukaani.org/xz.git
CI: Let CMake use the CC environment variable
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 0c1e6d900b
)
This commit is contained in:
parent
85a55e1120
commit
dde14ded9a
|
@ -242,10 +242,6 @@ then
|
||||||
|
|
||||||
add_extra_option "$SMALL" "-DHAVE_SMALL=ON" ""
|
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.
|
# Remove old cache file to clear previous settings.
|
||||||
rm -f "CMakeCache.txt"
|
rm -f "CMakeCache.txt"
|
||||||
cmake "$SRC_DIR/CMakeLists.txt" -B "$DEST_DIR" $EXTRA_OPTIONS -DADDITIONAL_CHECK_TYPES="$CHECK_TYPE" -G "Unix Makefiles"
|
cmake "$SRC_DIR/CMakeLists.txt" -B "$DEST_DIR" $EXTRA_OPTIONS -DADDITIONAL_CHECK_TYPES="$CHECK_TYPE" -G "Unix Makefiles"
|
||||||
|
|
Loading…
Reference in New Issue