diff --git a/Cargo.lock b/Cargo.lock index c828890e7..b128e1a76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -918,7 +918,7 @@ dependencies = [ [[package]] name = "redoxer" version = "0.2.63" -source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#5c74b7d78113bba19905225fe1a5d11adcc5c5a3" +source = "git+https://gitlab.redox-os.org/redox-os/redoxer.git#222c1a952172f7f900bea768ba44bb909add9809" dependencies = [ "anyhow", "dirs", diff --git a/src/cook/script.rs b/src/cook/script.rs index 328d372cc..f66bc85de 100644 --- a/src/cook/script.rs +++ b/src/cook/script.rs @@ -281,7 +281,7 @@ set(CMAKE_SYSTEM_NAME ${SYSTEM_NAME}) set(CMAKE_SYSTEM_PROCESSOR ${arch}) EOF - if [ "$target" = "$TARGET" ] + if [ "$target" = "$GNU_TARGET" ] then echo "set(CMAKE_C_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file echo "set(CMAKE_CXX_FLAGS \"${CFLAGS} ${CPPFLAGS}\")" >> $file @@ -301,7 +301,7 @@ function cookbook_cmake { else GCC_PREFIX=$GNU_TARGET- fi - generate_cookbook_cmake_file "$TARGET" "$GCC_PREFIX" "$COOKBOOK_SYSROOT" cross_file.cmake + generate_cookbook_cmake_file "$GNU_TARGET" "$GCC_PREFIX" "$COOKBOOK_SYSROOT" cross_file.cmake "${COOKBOOK_CMAKE}" "${COOKBOOK_SOURCE}" \ -DCMAKE_BUILD_TYPE=Release \