Merge branch 'rename-wrapper' into 'master'

Rename RUSTC_WRAPPER to CC_WRAPPER

See merge request redox-os/cookbook!524

config.sh

@@ -30,10 +30,10 @@ export RANLIB="${HOST}-gcc-ranlib"
 export READELF="${HOST}-readelf"
 export STRIP="${HOST}-strip"
 
-if [ -n "${RUSTC_WRAPPER}" ]
+if [ -n "${CC_WRAPPER}" ]
 then
-    export CC="${RUSTC_WRAPPER} ${CC}"
-    export CXX="${RUSTC_WRAPPER} ${CXX}"
+    export CC="${CC_WRAPPER} ${CC}"
+    export CXX="${CC_WRAPPER} ${CXX}"
 fi
 
 BUILD="$(cc -dumpmachine)"

recipes/dev/lua54/recipe.toml

@@ -8,7 +8,7 @@ script = """
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" posix \
     AR="${TARGET}-ar rcu" \
-    CC="${RUSTC_WRAPPER} ${TARGET}-gcc -std=gnu99" \
+    CC="${CC_WRAPPER} ${TARGET}-gcc -std=gnu99" \
     RANLIB="${TARGET}-ranlib" \
     SYSLDFLAGS="-static"
 

recipes/libs/openssl1/recipe.toml

@@ -14,7 +14,7 @@ COOKBOOK_CONFIGURE_FLAGS=(
     "redox-${ARCH}"
     --prefix="/"
 )
-export CC="${RUSTC_WRAPPER} ${TARGET}-gcc"
+export CC="${CC_WRAPPER} ${TARGET}-gcc"
 "${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}"
 "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}"
 "${COOKBOOK_MAKE}" install_sw install_ssldirs DESTDIR="${COOKBOOK_STAGE}"

recipes/tools/bzip2/recipe.toml

@@ -12,7 +12,7 @@ DYNAMIC_INIT
 rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" \
     AR="${TARGET}-ar" \
-    CC="${RUSTC_WRAPPER} ${TARGET}-gcc" \
+    CC="${CC_WRAPPER} ${TARGET}-gcc" \
     PREFIX="${COOKBOOK_STAGE}" \
     RANLIB="${TARGET}-ranlib" \
     install
@@ -25,7 +25,7 @@ rsync -av --delete "${COOKBOOK_SOURCE}/" ./
 "${COOKBOOK_MAKE}" -f Makefile-libbz2_so \
     -j"${COOKBOOK_MAKE_JOBS}" \
     AR="${TARGET}-ar" \
-    CC="${RUSTC_WRAPPER} ${TARGET}-gcc" \
+    CC="${CC_WRAPPER} ${TARGET}-gcc" \
     PREFIX="${COOKBOOK_STAGE}" \
     RANLIB="${TARGET}-ranlib"
 

src/bin/cook.rs

@@ -841,9 +841,10 @@ set(CMAKE_SYSTEM_NAME UnixPaths)
 set(CMAKE_SYSTEM_PROCESSOR $(echo "${TARGET}" | cut -d - -f1))
 EOF
 
-    if [ -n "$RUSTC_WRAPPER" ]; then
-        echo "set(CMAKE_C_COMPILER_LAUNCHER ${RUSTC_WRAPPER})" >> cross_file.cmake
-        echo "set(CMAKE_CXX_COMPILER_LAUNCHER ${RUSTC_WRAPPER})" >> cross_file.cmake
+    if [ -n "$CC_WRAPPER" ]
+    then
+        echo "set(CMAKE_C_COMPILER_LAUNCHER ${CC_WRAPPER})" >> cross_file.cmake
+        echo "set(CMAKE_CXX_COMPILER_LAUNCHER ${CC_WRAPPER})" >> cross_file.cmake
     fi
 
     "${COOKBOOK_CMAKE}" "${COOKBOOK_SOURCE}" \