From f6e961a994d5c216067da25404ec73d3b2af0e88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Thu, 14 Dec 2017 20:11:31 +0000
Subject: Revert "vars/build.vars:native_{tools,toolchain{_deps,},runtime}:
 always pass --sysroot=${PREFIX_NATIVE}."

This reverts commit 9bf6752611357442ff20f04453b424de5547502e.
---
 vars/build.vars | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/vars/build.vars b/vars/build.vars
index 57e74898..cf978285 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -139,9 +139,7 @@ HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32";
 #
 # Build target native_tools
 #
-NATIVE_TOOLS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_TOOLS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
-NATIVE_TOOLS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_TOOLS_PACKAGES="
 slibtool perk pkgconf";
 NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
@@ -158,9 +156,7 @@ NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
 #
 # Build target native_toolchain_deps
 #
-NATIVE_TOOLCHAIN_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
-NATIVE_TOOLCHAIN_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_TOOLCHAIN_DEPS_PACKAGES="
 gmp libelf mpfr mpc";
 NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
@@ -177,23 +173,23 @@ NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
 : ${PKG_MPFR_VERSION:=3.1.2};
 : ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
+: ${PKG_MPFR_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE}};
 : ${PKG_MPC_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
 : ${PKG_MPC_VERSION:=1.0.1};
 : ${PKG_MPC_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_VERSION}.tar.gz};
+: ${PKG_MPC_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
 
 #
 # Build target native_toolchain
 #
-NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 NATIVE_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
-NATIVE_TOOLCHAIN_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_TOOLCHAIN_PACKAGES="
 binutils musl_full gcc_full mdso";
 NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_VERSION:=2.24.51};
 : ${PKG_BINUTILS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2};
-: ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-sysroot=/"};
+: ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"};
 : ${PKG_BINUTILS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_LIBTOOL:=slibtool-static};
 : ${PKG_MUSL_FULL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
@@ -227,10 +223,9 @@ NATIVE_TOOLCHAIN_MINGW32_PREFIX="${PREFIX_NATIVE}";
 # Build target native_runtime
 #
 NATIVE_RUNTIME_BUILD_TYPE="native";
-NATIVE_RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME:+${DEFAULT_CFLAGS_RUNTIME} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_RUNTIME_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS_RUNTIME}";
 NATIVE_RUNTIME_CONFIGURE_ARGS="--prefix= --strict --host=${DEFAULT_TARGET}";
 NATIVE_RUNTIME_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib";
-NATIVE_RUNTIME_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_RUNTIME_PACKAGES="psxtypes pemagine dalist ldso ntcon ntapi psxscl psxscl_strace ntctty ptycon u16ports";
 NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes};
-- 
cgit v1.2.3