summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-12-16 04:19:05 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-12-16 04:19:05 +0000
commit8fbba399cb5532009e7bfdea81296440a80fede4 (patch)
treec2174bc7477023a0191ea1b017469fe12c8370eb
parentusers should be able to get the bin, lib, etc path .. (diff)
downloadgcc-config-8fbba399cb5532009e7bfdea81296440a80fede4.tar.gz
gcc-config-8fbba399cb5532009e7bfdea81296440a80fede4.tar.bz2
gcc-config-8fbba399cb5532009e7bfdea81296440a80fede4.zip
new versionv1.2.2
-rwxr-xr-xgcc-config31
1 files changed, 17 insertions, 14 deletions
diff --git a/gcc-config b/gcc-config
index 07be13b..1d09a3f 100755
--- a/gcc-config
+++ b/gcc-config
@@ -2,7 +2,7 @@
# Copyright 1999-2002 Gentoo Foundation
# Distributed under the terms of the GNU General Public License
# Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.2.1,v 1.1 2002/11/27 21:45:37 azarah Exp $
+# $Header: gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.2.2,v 1.1 2002/12/16 04:19:05 azarah Exp $
source /etc/init.d/functions.sh || {
@@ -122,19 +122,22 @@ switch_profile() {
source /etc/env.d/gcc/${GCC_COMP}
- if [ -d /usr/include/${STDCXX_INCDIR} -a ! -L /usr/include/${STDCXX_INCDIR} ]
- then
- ${MV} /usr/include/${STDCXX_INCDIR} /usr/include/${STDCXX_INCDIR}.orig
- elif [ -L /usr/include/${STDCXX_INCDIR} ]
- then
- ${RM} -f /usr/include/${STDCXX_INCDIR}
- fi
- ${LN} -snf ..${LDPATH/\/usr}/include/${STDCXX_INCDIR} /usr/include/${STDCXX_INCDIR}
-
- [ -L /lib/cpp -o -f /lib/cpp ] && ${RM} -f /lib/cpp
- ${LN} -snf ..${PATH}/cpp /lib/cpp
- [ -L /usr/bin/cc -o -f /usr/bin/cc ] && ${RM} -f /usr/bin/cc
- ${LN} -snf ../..${PATH}/gcc /usr/bin/cc
+# These are in gcc's internal include dir, so no need for symlinks or other
+# hacks ...
+# if [ -d /usr/include/${STDCXX_INCDIR} -a ! -L /usr/include/${STDCXX_INCDIR} ]
+# then
+# ${MV} /usr/include/${STDCXX_INCDIR} /usr/include/${STDCXX_INCDIR}.orig
+# elif [ -L /usr/include/${STDCXX_INCDIR} ]
+# then
+# ${RM} -f /usr/include/${STDCXX_INCDIR}
+# fi
+# ${LN} -snf ..${LDPATH/\/usr}/include/${STDCXX_INCDIR} /usr/include/${STDCXX_INCDIR}
+
+# We use wrapper scripts from gcc-3.2.1-r6 ....
+# [ -L /lib/cpp -o -f /lib/cpp ] && ${RM} -f /lib/cpp
+# ${LN} -snf ..${PATH}/cpp /lib/cpp
+# [ -L /usr/bin/cc -o -f /usr/bin/cc ] && ${RM} -f /usr/bin/cc
+# ${LN} -snf ../..${PATH}/gcc /usr/bin/cc
echo "CURRENT=${GCC_COMP}" > /etc/env.d/gcc/config