diff options
Diffstat (limited to 'src/stage1')
4 files changed, 8 insertions, 9 deletions
diff --git a/src/stage1/toolchain-pkgbuilds/binutils/PKGBUILD.in b/src/stage1/toolchain-pkgbuilds/binutils/PKGBUILD.in index 23333f3..9e08603 100644 --- a/src/stage1/toolchain-pkgbuilds/binutils/PKGBUILD.in +++ b/src/stage1/toolchain-pkgbuilds/binutils/PKGBUILD.in @@ -27,7 +27,6 @@ build() { ./configure --target=$_target \ --prefix=/usr \ --with-sysroot=/usr/$_target \ - --@MULTILIB@-multilib \ --disable-werror \ --disable-nls \ --with-expat=yes \ diff --git a/src/stage1/toolchain-pkgbuilds/gcc-bootstrap/PKGBUILD.in b/src/stage1/toolchain-pkgbuilds/gcc-bootstrap/PKGBUILD.in index fb7f0a8..4b5b36d 100644 --- a/src/stage1/toolchain-pkgbuilds/gcc-bootstrap/PKGBUILD.in +++ b/src/stage1/toolchain-pkgbuilds/gcc-bootstrap/PKGBUILD.in @@ -59,7 +59,6 @@ build() { $srcdir/gcc/configure \ --target=$_target \ - @GCC_CONFIG_FLAGS@ \ --prefix=/usr \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ @@ -82,7 +81,8 @@ build() { --disable-nls \ --@MULTILIB@-multilib \ --disable-bootstrap \ - --enable-checking=release + --enable-checking=release \ + @GCC_CONFIG_FLAGS@ make inhibit-libc=true all-gcc make inhibit-libc=true all-target-libgcc diff --git a/src/stage1/toolchain-pkgbuilds/gcc/PKGBUILD.in b/src/stage1/toolchain-pkgbuilds/gcc/PKGBUILD.in index 1f1dae3..fdf7f53 100644 --- a/src/stage1/toolchain-pkgbuilds/gcc/PKGBUILD.in +++ b/src/stage1/toolchain-pkgbuilds/gcc/PKGBUILD.in @@ -59,7 +59,6 @@ build() { $srcdir/gcc/configure \ --target=$_target \ - @GCC_CONFIG_FLAGS@ \ --prefix=/usr \ --libdir=/usr/lib \ --libexecdir=/usr/lib \ @@ -77,7 +76,8 @@ build() { --disable-nls \ --@MULTILIB@-multilib \ --disable-bootstrap \ - --enable-checking=release + --enable-checking=release \ + @GCC_CONFIG_FLAGS@ make } diff --git a/src/stage1/toolchain-pkgbuilds/glibc/PKGBUILD.in b/src/stage1/toolchain-pkgbuilds/glibc/PKGBUILD.in index 3ff965c..d5b0e7b 100644 --- a/src/stage1/toolchain-pkgbuilds/glibc/PKGBUILD.in +++ b/src/stage1/toolchain-pkgbuilds/glibc/PKGBUILD.in @@ -80,8 +80,8 @@ build() { CFLAGS=${CFLAGS/-fno-plt/} CXXFLAGS=${CXXFLAGS/-fno-plt/} - CFLAGS="$CFLAGS -mcmodel=medlow -g -O2 @PLATFORM32_CFLAGS@" \ - ASFLAGS="$ASFLAGS -mcmodel=medlow @PLATFORM32_CFLAGS@" \ + CFLAGS="$CFLAGS -g -O2 @PLATFORM32_CFLAGS@" \ + ASFLAGS="$ASFLAGS @PLATFORM32_CFLAGS@" \ "$srcdir/glibc-$pkgver/configure" \ --host=@CHOST32@ \ --libdir=/usr/lib32 \ @@ -102,13 +102,13 @@ build() { } package() { - cd glibc-build + cd "$srcdir/glibc-build" make install_root=$pkgdir/usr/$_target install [ "x@MULTILIB@" == "xenable" ] || return 0 - cd lib32-glibc-build + cd "$srcdir/lib32-glibc-build" make install_root=$pkgdir/usr/$_target install } |