Skip to content
Snippets Groups Projects
Commit 96e276d0 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fix pkgutils build

parent 0b2585a5
No related branches found
No related tags found
No related merge requests found
...@@ -7,4 +7,3 @@ export TARGET=x86_64-unknown-redox ...@@ -7,4 +7,3 @@ export TARGET=x86_64-unknown-redox
# Automatic variables # Automatic variables
ROOT="$(cd `dirname "$0"` && pwd)" ROOT="$(cd `dirname "$0"` && pwd)"
REPO="$ROOT/repo/$TARGET" REPO="$ROOT/repo/$TARGET"
export CC="x86_64-elf-redox-gcc"
...@@ -200,7 +200,7 @@ function op { ...@@ -200,7 +200,7 @@ function op {
echo "target = \"$TARGET\"" >> "stage.toml" echo "target = \"$TARGET\"" >> "stage.toml"
mkdir -p stage/pkg mkdir -p stage/pkg
cp -v stage.toml "stage/pkg/$1.toml" 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) untar)
rm -rfv stage.tar stage.sig stage.toml rm -rfv stage.tar stage.sig stage.toml
......
VERSION=5.3.1 VERSION=5.3.1
TAR=http://www.lua.org/ftp/lua-$VERSION.tar.gz TAR=http://www.lua.org/ftp/lua-$VERSION.tar.gz
HOST=x86_64-elf-redox
function recipe_version { function recipe_version {
echo "$VERSION" echo "$VERSION"
return 1 return 1
...@@ -12,7 +14,7 @@ function recipe_update { ...@@ -12,7 +14,7 @@ function recipe_update {
} }
function recipe_build { function recipe_build {
make generic CC="$CC -std=gnu99" make generic CC="${HOST}-gcc -std=gnu99"
return 1 return 1
} }
......
GIT=https://github.com/redox-os/newlib.git GIT=https://github.com/redox-os/newlib.git
BRANCH=redox BRANCH=redox
CC=
HOST=x86_64-elf-redox HOST=x86_64-elf-redox
function recipe_version { function recipe_version {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment