diff --git a/config.sh b/config.sh index 09d8ae33b75c6dfebbb2b193b46f44361c850201..4d3de73a60b18fbdf5fc24eccba276e5c76c0dea 100755 --- a/config.sh +++ b/config.sh @@ -7,4 +7,3 @@ export TARGET=x86_64-unknown-redox # Automatic variables ROOT="$(cd `dirname "$0"` && pwd)" REPO="$ROOT/repo/$TARGET" -export CC="x86_64-elf-redox-gcc" diff --git a/cook.sh b/cook.sh index 7495999aa3a8f48f1b0d4b16d11e6867dc9941bf..0d3122c24c77559dbc3d7119bb3551903acd0c54 100755 --- a/cook.sh +++ b/cook.sh @@ -200,7 +200,7 @@ function op { echo "target = \"$TARGET\"" >> "stage.toml" mkdir -p stage/pkg cp -v stage.toml "stage/pkg/$1.toml" - TARGET=x86_64-unknown-redox cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- create stage + cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- create stage ;; untar) rm -rfv stage.tar stage.sig stage.toml diff --git a/recipes/lua/recipe.sh b/recipes/lua/recipe.sh index 453c9e04910ffc84d437119a257508cabb559e9f..b15314105b4a8015138aa65567ddc87a3a246a32 100644 --- a/recipes/lua/recipe.sh +++ b/recipes/lua/recipe.sh @@ -1,6 +1,8 @@ VERSION=5.3.1 TAR=http://www.lua.org/ftp/lua-$VERSION.tar.gz +HOST=x86_64-elf-redox + function recipe_version { echo "$VERSION" return 1 @@ -12,7 +14,7 @@ function recipe_update { } function recipe_build { - make generic CC="$CC -std=gnu99" + make generic CC="${HOST}-gcc -std=gnu99" return 1 } diff --git a/recipes/newlib/recipe.sh b/recipes/newlib/recipe.sh index b2aef6c526afd56cfc5ce8e508f8e1131f84b8e2..c55d1db42b18d8a7e782b5c205f9c9c08a862e2a 100644 --- a/recipes/newlib/recipe.sh +++ b/recipes/newlib/recipe.sh @@ -1,8 +1,6 @@ GIT=https://github.com/redox-os/newlib.git BRANCH=redox -CC= - HOST=x86_64-elf-redox function recipe_version {