summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups.d/030.cross_toolchain.group12
1 files changed, 6 insertions, 6 deletions
diff --git a/groups.d/030.cross_toolchain.group b/groups.d/030.cross_toolchain.group
index 03956a3f..928838a2 100644
--- a/groups.d/030.cross_toolchain.group
+++ b/groups.d/030.cross_toolchain.group
@@ -18,12 +18,12 @@ CROSS_TOOLCHAIN_RPM_DISABLE=1;
: ${PKG_BINUTILS_CROSS_VERSION:=2.24.51};
: ${PKG_BINUTILS_CROSS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_CROSS_VERSION}.tar.bz2};
: ${PKG_BINUTILS_CROSS_AUTOCONF_CONFIG_GUESS:="keep"};
-: ${PKG_BINUTILS_CROSS_CFLAGS_CONFIGURE:="-I${PREFIX}/include -g2 -O0"};
+: ${PKG_BINUTILS_CROSS_CFLAGS_CONFIGURE:="-I${PREFIX_LOCAL}/include -g2 -O0"};
: ${PKG_BINUTILS_CROSS_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --prefix=${PREFIX_LOCAL} --target=${DEFAULT_TARGET} --with-sysroot=${PREFIX_CROSS}"};
: ${PKG_BINUTILS_CROSS_INSTALL_FILES_V2:="
@%[_target]-windmc=bin/windmc
@%[_target]-windres=bin/windres"};
-: ${PKG_BINUTILS_CROSS_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_BINUTILS_CROSS_LDFLAGS_CONFIGURE:="-L${PREFIX_LOCAL}/lib -Wl,-rpath,${PREFIX_LOCAL}/lib"};
: ${PKG_BINUTILS_CROSS_LIBTOOL:=slibtool-static};
: ${PKG_BINUTILS_CROSS_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="};
: ${PKG_BINUTILS_CROSS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_CROSS_VERSION}.midipix.patch"};
@@ -65,9 +65,9 @@ CROSS_TOOLCHAIN_RPM_DISABLE=1;
: ${PKG_GCC_STAGE1_CROSS_MINGW32_DEPENDS:="binutils_cross_mingw32 gmp_cross mpc_cross mpfr_cross"};
: ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4};
: ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-cross-x86_64-w64-mingw32};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX_LOCAL}/include"};
: ${PKG_GCC_STAGE1_CROSS_MINGW32_CONFIGURE_ARGS:="--disable-nls --prefix=${PREFIX_LOCAL} --target=x86_64-w64-mingw32"};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_LDFLAGS_CONFIGURE:="-L${PREFIX_LOCAL}/lib -Wl,-rpath,${PREFIX_LOCAL}/lib"};
: ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
: ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX_LOCAL}};
: ${PKG_GCC_STAGE1_CROSS_MINGW32_TARGET:="x86_64-w64-mingw32"};
@@ -76,9 +76,9 @@ CROSS_TOOLCHAIN_RPM_DISABLE=1;
: ${PKG_GCC_STAGE1_CROSS_DEPENDS:="binutils_cross gmp_cross mpc_cross mpfr_cross"};
: ${PKG_GCC_STAGE1_CROSS_VERSION:=4.6.4};
: ${PKG_GCC_STAGE1_CROSS_BASE_DIR:=${BUILD_WORKDIR}/gcc-cross-${DEFAULT_TARGET}};
-: ${PKG_GCC_STAGE1_CROSS_CFLAGS_CONFIGURE:="-I${PREFIX}/include -g3 -O0"};
+: ${PKG_GCC_STAGE1_CROSS_CFLAGS_CONFIGURE:="-I${PREFIX_LOCAL}/include -g3 -O0"};
: ${PKG_GCC_STAGE1_CROSS_GITROOT:=${DEFAULT_GITROOT}};
-: ${PKG_GCC_STAGE1_CROSS_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib"};
+: ${PKG_GCC_STAGE1_CROSS_LDFLAGS_CONFIGURE:="-L${PREFIX_LOCAL}/lib -Wl,-rpath,${PREFIX_LOCAL}/lib"};
: ${PKG_GCC_STAGE1_CROSS_PREFIX:=${PREFIX_LOCAL}};
: ${PKG_GCC_STAGE1_CROSS_VARS_FILE:="vars/gcc.vars"};