diff options
Diffstat (limited to 'vars/gcc.vars')
| -rw-r--r-- | vars/gcc.vars | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/vars/gcc.vars b/vars/gcc.vars index b1f6abab..1660334e 100644 --- a/vars/gcc.vars +++ b/vars/gcc.vars @@ -39,9 +39,9 @@ pkgp_gcc_setup_env() { }; pkgp_gcc_configure() { - build_fileop rm "${PKG_BUILD_DIR}"; - build_fileop mkdir "${PKG_BUILD_DIR}"; - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop rm "${WORKDIR}/${PKG_BUILD_DIR}"; + build_fileop mkdir "${WORKDIR}/${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; "../cbb-gcc-${PKG_GCC_VERSION}/configure" "${@}"\ --disable-bootstrap \ --disable-libmudflap \ @@ -72,6 +72,10 @@ pkg_gcc_stage1_cross_x86_64_w64_mingw32_all() { }; pkg_gcc_stage1_native_x86_64_w64_mingw32_all() { + export AR="${TARGET}-ar"; + export CC="${TARGET}-gcc"; + export CXX="${TARGET}-g++"; + export RANLIB="${TARGET}-ranlib"; pkg_gcc_stage1_all "${@}"; }; @@ -114,7 +118,7 @@ pkg_gcc_stage1_all() { --with-sysroot="${PREFIX}/${PKG_TARGET}"\ --without-headers; ;; gcc_stage1_native_x86_64_w64_mingw32) - patch -b -d cbb-gcc-4.6.4 -p1 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch"; + patch -b -d "${WORKDIR}/cbb-gcc-4.6.4" -p1 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch"; pkgp_gcc_configure \ --build=x86_64-unknown-linux-gnu \ --enable-sjlj-exceptions \ @@ -128,7 +132,7 @@ pkg_gcc_stage1_all() { --without-headers; ;; esac; else - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; fi; if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then make ${MAKEFLAGS} all-gcc; @@ -157,7 +161,7 @@ pkg_gcc_runtime_all() { local _restart_at="${1}"; export MAKE="make LIBTOOL=slibtool"; set_build_dir "cbb-gcc-${PKG_GCC_RUNTIME_VERSION}" cross; - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; # GCC, compiler runtime. if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then make ${MAKEFLAGS} all-target-libgcc; @@ -174,7 +178,7 @@ pkg_gcc_libstdcpp_v3_all() { local _restart_at="${1}"; export MAKE="make LIBTOOL=slibtool"; set_build_dir "cbb-gcc-${PKG_GCC_LIBSTDCPP_V3_VERSION}" cross; - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; # GCC, libstdc++-v3. if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then make ${MAKEFLAGS} all-target-libstdc++-v3; @@ -191,7 +195,7 @@ pkg_gcc_full_all() { local _restart_at="${1}"; export MAKE="make LIBTOOL=slibtool"; set_build_dir "cbb-gcc-${PKG_GCC_FULL_VERSION}" cross; - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; # GCC, everything else. if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then make ${MAKEFLAGS}; @@ -231,7 +235,7 @@ pkg_gcc_native_all() { --with-mpfr="${PKG_PREFIX}" \ --with-sysroot=; else - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; fi; if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then make ${MAKEFLAGS} all-gcc; |