From 29278333b2edf77b1d1dbd023c1e656a022d7207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sun, 9 Feb 2020 09:35:00 +0000 Subject: vars/build.vars:host_toolchain_deps:${PKG_PREFIX}: set to ${PREFIX}. vars/build.vars:mpfr_host:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-gmp=${PREFIX}. vars/build.vars:mpc_host:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-gmp=${PREFIX} --with-mpfr=${PREFIX}. vars/build.vars:psxtypes_host:${PKG_PREFIX}: override w/ ${PREFIX_CROSS}. vars/build.vars:gcc_stage1_host:${PKG_CFLAGS_CONFIGURE}: configure w/ -I${PREFIX}/include. vars/build.vars:gcc_stage1_host:${PKG_LDFLAGS_CONFIGURE}: configure w/ -Wl,-rpath,${PREFIX_CROSS}/lib. vars/gcc.vars:pkgp_gcc_setup_env(): pass ${LDFLAGS} from ${PKG_LDFLAGS_CONFIGURE}. vars/gcc.vars:pkg_gcc_stage1_{cross,native}_mingw32_all(): correctly mkdir w/ ex_rtl_fileop. vars/gcc.vars:pkg_gcc_stage1_all(): pass --with-{gmp,mpc,mpfr}="${PREFIX}". --- vars/gcc.vars | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'vars/gcc.vars') 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) -- cgit v1.2.3