diff --git a/config.sh b/config.sh index d363c652f..a1f0e9319 100755 --- a/config.sh +++ b/config.sh @@ -30,6 +30,12 @@ export RANLIB="${HOST}-gcc-ranlib" export READELF="${HOST}-readelf" export STRIP="${HOST}-strip" +if [ -n "${RUSTC_WRAPPER}" ] +then + export CC="${RUSTC_WRAPPER} ${CC}" + export CXX="${RUSTC_WRAPPER} ${CXX}" +fi + BUILD="$(cc -dumpmachine)" export PKG_CONFIG_FOR_BUILD="pkg-config" diff --git a/recipes/dev/lua54/recipe.toml b/recipes/dev/lua54/recipe.toml index 5f2f15492..23babe5c7 100644 --- a/recipes/dev/lua54/recipe.toml +++ b/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="${TARGET}-gcc -std=gnu99" \ + CC="${RUSTC_WRAPPER} ${TARGET}-gcc -std=gnu99" \ RANLIB="${TARGET}-ranlib" \ SYSLDFLAGS="-static" diff --git a/recipes/libs/openssl1/recipe.toml b/recipes/libs/openssl1/recipe.toml index d96b7ec9e..ec8bce545 100644 --- a/recipes/libs/openssl1/recipe.toml +++ b/recipes/libs/openssl1/recipe.toml @@ -14,7 +14,7 @@ COOKBOOK_CONFIGURE_FLAGS=( "redox-${ARCH}" --prefix="/" ) -export CC="${TARGET}-gcc" +export CC="${RUSTC_WRAPPER} ${TARGET}-gcc" "${COOKBOOK_CONFIGURE}" "${COOKBOOK_CONFIGURE_FLAGS[@]}" "${COOKBOOK_MAKE}" -j"${COOKBOOK_MAKE_JOBS}" "${COOKBOOK_MAKE}" install_sw install_ssldirs DESTDIR="${COOKBOOK_STAGE}" diff --git a/recipes/tools/bzip2/recipe.toml b/recipes/tools/bzip2/recipe.toml index 23eacc6bc..af7282da8 100644 --- a/recipes/tools/bzip2/recipe.toml +++ b/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="${TARGET}-gcc" \ + CC="${RUSTC_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="${TARGET}-gcc" \ + CC="${RUSTC_WRAPPER} ${TARGET}-gcc" \ PREFIX="${COOKBOOK_STAGE}" \ RANLIB="${TARGET}-ranlib" diff --git a/src/bin/cook.rs b/src/bin/cook.rs index 7624755ef..61e688de4 100644 --- a/src/bin/cook.rs +++ b/src/bin/cook.rs @@ -841,6 +841,11 @@ 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 + fi + "${COOKBOOK_CMAKE}" "${COOKBOOK_SOURCE}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CROSSCOMPILING=True \ @@ -870,6 +875,8 @@ COOKBOOK_MESON_FLAGS=( ) function cookbook_meson { echo "[binaries]" > cross_file.txt + echo "c = [$(printf "'%s', " $CC | sed 's/, $//')]" >> cross_file.txt + echo "cpp = [$(printf "'%s', " $CXX | sed 's/, $//')]" >> cross_file.txt echo "c = '${CC}'" >> cross_file.txt echo "cpp = '${CXX}'" >> cross_file.txt echo "ar = '${AR}'" >> cross_file.txt