diff options
| -rw-r--r-- | vars/build.vars | 9 | ||||
| -rw-r--r-- | vars/gcc.vars | 13 |
2 files changed, 16 insertions, 6 deletions
diff --git a/vars/build.vars b/vars/build.vars index 6cb24a47..3614d513 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -242,7 +242,7 @@ HOST_TOOLCHAIN_DEPS_BUILD_TYPE="host"; HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --prefix="; HOST_TOOLCHAIN_DEPS_PACKAGES=" gmp_host mpfr_host mpc_host psxtypes_host"; -HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX_CROSS}"; +HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}"; : ${PKG_GMP_HOST_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2}; : ${PKG_GMP_HOST_VERSION:=6.1.2}; : ${PKG_GMP_HOST_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_HOST_VERSION}.tar.bz2}; @@ -251,14 +251,15 @@ HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX_CROSS}"; : ${PKG_MPFR_HOST_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b}; : ${PKG_MPFR_HOST_VERSION:=3.1.2}; : ${PKG_MPFR_HOST_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_HOST_VERSION}.tar.bz2}; -: ${PKG_MPFR_HOST_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_CROSS}}; +: ${PKG_MPFR_HOST_CONFIGURE_ARGS_EXTRA:="--with-gmp=${PREFIX}"}; : ${PKG_MPC_HOST_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff}; : ${PKG_MPC_HOST_VERSION:=1.0.1}; : ${PKG_MPC_HOST_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_HOST_VERSION}.tar.gz}; -: ${PKG_MPC_HOST_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_CROSS} --with-mpfr=${PREFIX_CROSS}}; +: ${PKG_MPC_HOST_CONFIGURE_ARGS_EXTRA:="--with-gmp=${PREFIX} --with-mpfr=${PREFIX}"}; : ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes}; : ${PKG_PSXTYPES_HOST_BUILD_STEPS_DISABLE:=build}; : ${PKG_PSXTYPES_HOST_IN_TREE:=1}; +: ${PKG_PSXTYPES_HOST_PREFIX:="${PREFIX_CROSS}"}; # # Build target host_toolchain @@ -282,7 +283,9 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}"; : ${PKG_BINUTILS_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"}; : ${PKG_GCC_STAGE1_HOST_VERSION:=4.6.4}; : ${PKG_GCC_STAGE1_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}}; +: ${PKG_GCC_STAGE1_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"}; : ${PKG_GCC_STAGE1_HOST_GITROOT:=${DEFAULT_GITROOT}}; +: ${PKG_GCC_STAGE1_HOST_LDFLAGS_CONFIGURE:="-Wl,-rpath,${PREFIX}/lib"}; : ${PKG_GCC_STAGE1_HOST_PREFIX:=${PREFIX}}; : ${PKG_PSXSTUB_HOST_URLS_GIT:="psxstub=${DEFAULT_GITROOT}/psxstub"}; : ${PKG_PSXSTUB_HOST_IN_TREE:=1}; diff --git a/vars/gcc.vars b/vars/gcc.vars index 01ded3b5..aa0af83f 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -23,7 +23,8 @@ pkgp_gcc_setup_env() { export cbb_neutral_libiberty=no \ cbb_ldflags_for_target=--sysroot="${PREFIX_CROSS}" \ cbb_sysroot_for_libgcc="${PREFIX_CROSS}" \ - cbb_xgcc_for_specs="${PKG_BASE_DIR}/${PKG_BUILD_DIR}/gcc/xgcc"; ;; + cbb_xgcc_for_specs="${PKG_BASE_DIR}/${PKG_BUILD_DIR}/gcc/xgcc" \ + LDFLAGS="${PKG_LDFLAGS_CONFIGURE}"; ;; gcc_stage1_cross_mingw32) GCCTARGET_FLAGS="-DIN_TARGET_LIBRARY_BUILD --sysroot=${PREFIX_MINGW32} -midata"; export cbb_neutral_libiberty=no \ @@ -97,7 +98,7 @@ pkg_gcc_stage1_cross_mingw32_all() { ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw"; ex_rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32"; ex_rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw"; - mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include"; + ex_rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include"; pkg_gcc_stage1_all "${@}"; }; @@ -105,7 +106,7 @@ pkg_gcc_stage1_native_mingw32_all() { ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw"; ex_rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32"; ex_rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw"; - mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include"; + ex_rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include"; pkg_gcc_stage1_all "${@}"; }; @@ -140,11 +141,17 @@ pkg_gcc_stage1_all() { pkgp_gcc_configure \ --disable-sjlj-exceptions \ --prefix="${PREFIX}" \ + --with-gmp="${PREFIX}" \ + --with-mpc="${PREFIX}" \ + --with-mpfr="${PREFIX}" \ --with-sysroot="${PREFIX_CROSS}"; ;; gcc_stage1_cross_mingw32) pkgp_gcc_configure \ --enable-sjlj-exceptions \ --prefix="${PREFIX}" \ + --with-gmp="${PREFIX}" \ + --with-mpc="${PREFIX}" \ + --with-mpfr="${PREFIX}" \ --with-sysroot="${PREFIX_MINGW32}" \ --without-headers; ;; gcc_stage1_native_mingw32) |