summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArwed von Merkatz2008-09-02 16:51:19 +0200
committerArwed von Merkatz2008-09-02 16:51:19 +0200
commit82cb52115649739caeca19eafcb483d3d79e596b (patch)
treedc9ea37081f16624d14c4e99d69c8394b84bc1e0
parented4817ef365b4a9cc21c3f2601fee734a9f014ea (diff)
Revert "g++: make the upgrade work when there is a (now broken, old) g++ is installed"
This reverts commit cb26e92036437e1b61d1d0f10f21e7c61b6399c7.
-rwxr-xr-xgnu/g++/BUILD3
-rw-r--r--gnu/g++/HISTORY4
2 files changed, 1 insertions, 6 deletions
diff --git a/gnu/g++/BUILD b/gnu/g++/BUILD
index bdc36b7ef4..9c985892f9 100755
--- a/gnu/g++/BUILD
+++ b/gnu/g++/BUILD
@@ -23,8 +23,7 @@ if [[ "$GCC_NOLIB64" == 'y' ]]; then
fi &&
cd $SOURCE_DIRECTORY.bld &&
-# Ignore any installed g++, it could botch up configure!
-CXX=/bin/false $SOURCE_DIRECTORY/configure \
+$SOURCE_DIRECTORY/configure \
--host=$HOST \
--prefix=${INSTALL_ROOT}/usr \
--infodir=${INSTALL_ROOT}/usr/share/info \
diff --git a/gnu/g++/HISTORY b/gnu/g++/HISTORY
index 05926050c7..feb934f502 100644
--- a/gnu/g++/HISTORY
+++ b/gnu/g++/HISTORY
@@ -1,7 +1,3 @@
-2008-08-20 Thomas Orgis <sobukus@sourcemage.org>
- * BUILD: workaround for g++ upgrade where installed g++ (older version)
- is broken
-
2008-06-11 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 4.3.1