From c6d1d099b19f7bfb22a724a05b69f8ff6d03af2c Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Thu, 4 Mar 2004 13:56:48 +0000 Subject: [PATCH] Clifford Wolf: fixed cross-compiler for archs such as x86_64 git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2480 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/gcc3/gcc3.conf | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/package/base/gcc3/gcc3.conf b/package/base/gcc3/gcc3.conf index 4d6b9bac9..fcd82ddf6 100644 --- a/package/base/gcc3/gcc3.conf +++ b/package/base/gcc3/gcc3.conf @@ -348,19 +348,21 @@ gcc_stage0() { cd $root/$prefix/lib/${gcc_lib_dir} mv specs specs.orig + # Hint for the reader: + # The options are listed in _inverse_ order here. x="$base/build/$ROCKCFG_ID/root" - tr '\n' '@' < specs.orig | \ - sed -e "s|@\\*link:@|@*link:@-L $x/lib |" \ - -e "s|@\\*link:@|@*link:@-L $x/usr/lib |" \ - -e "s|@\\*link:@|@*link:@-L $x/usr/local/lib |" \ - -e "s|@\\*link:@|@*link:@-L $x/usr/$arch_target/lib |" \ + tr '\n' '@' < specs.orig | sed \ -e "s|@\\*link:@|@*link:@-L /usr/$arch_target/lib |" \ - -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/include |" \ - -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/local/include |" \ - -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/$arch_target/include |" \ + -e "s|@\\*link:@|@*link:@-L $x/usr/$arch_target/lib |" \ + -e "s|@\\*link:@|@*link:@-L $x/usr/local/lib |" \ + -e "s|@\\*link:@|@*link:@-L $x/usr/lib |" \ + -e "s|@\\*link:@|@*link:@-L $x/lib |" \ + -e "s|@\\*link:@|@*link:@-rpath-link $x/lib |" \ + -e "s|@\\*cpp:@|@*cpp:@-I /usr/$arch_target/include |" \ -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/$arch_target/include |" \ - -e "s|@\\*cpp:@|@*cpp:@-I /usr/$arch_target/include |" | - tr '@' '\n' > specs + -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/local/include |" \ + -e "s|@\\*cpp:@|@*cpp:@-I $x/usr/include |" \ + | tr '@' '\n' > specs rm -f $root/$prefix/.lastupdate }