From 96e276d04cb2c4b23f78fdbb575af2548eb4fcc7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sun, 4 Jun 2017 20:25:49 -0600
Subject: [PATCH] Fix pkgutils build
---
config.sh | 1 -
cook.sh | 2 +-
recipes/lua/recipe.sh | 4 +++-
recipes/newlib/recipe.sh | 2 --
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/config.sh b/config.sh
index 09d8ae33b..4d3de73a6 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 7495999aa..0d3122c24 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 453c9e049..b15314105 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 b2aef6c52..c55d1db42 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 {
--
GitLab