Attempt to fix issue with gcc paths

This commit is contained in:
Jeremy Soller 2018-11-26 21:48:41 -07:00
parent 4416fc2925
commit 5e24c0d3d8
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
2 changed files with 14 additions and 4 deletions

View File

@ -1,6 +1,7 @@
GIT=https://gitlab.redox-os.org/redox-os/gcc.git
BRANCH=redox
DEPENDS="gnu-binutils newlib"
BUILD_DEPENDS=(relibc)
DEPENDS="gnu-binutils relibc"
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@ -19,8 +20,12 @@ function recipe_build {
cp config.sub mpfr/config.sub
cp -f config.sub mpc/config.sub
./configure --host=${HOST} --target=${HOST} --prefix=/ --enable-static --disable-shared --disable-dlopen --disable-nls --enable-languages=c,c++
make all-gcc all-target-libgcc all-target-libstdc++-v3
sysroot="${PWD}/../sysroot"
mkdir -p "$sysroot/usr"
ln -sf "$sysroot/include" "$sysroot/usr/include"
ln -sf "$sysroot/lib" "$sysroot/usr/lib"
./configure --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/ --with-build-sysroot="$sysroot" --enable-static --disable-shared --disable-dlopen --disable-nls --enable-languages=c,c++
make -j "$(nproc)" all-gcc all-target-libgcc all-target-libstdc++-v3
skip=1
}

View File

@ -1,4 +1,5 @@
GIT=https://gitlab.redox-os.org/redox-os/binutils-gdb.git
BUILD_DEPENDS=(relibc)
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@ -11,7 +12,11 @@ function recipe_update {
}
function recipe_build {
./configure --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/usr/$HOST --disable-gdb --disable-nls --disable-werror
sysroot="${PWD}/../sysroot"
mkdir -p "$sysroot/usr"
ln -sf "$sysroot/include" "$sysroot/usr/include"
ln -sf "$sysroot/lib" "$sysroot/usr/lib"
./configure --host=${HOST} --target=${HOST} --prefix=/ --with-sysroot=/ --with-build-sysroot="$sysroot" --disable-gdb --disable-nls --disable-werror
make
skip=1
}