[Lunar-commits] <moonbase> gcc: The short story; ntl barfed looking for /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.2/crtbeginS.o

[Dennis `stumbles` Veatch]

commit f5e158f30ee2a6dd27d20f9901f5a4229ef05a7b
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Oct 9 17:24:52 2011 -0400

    gcc: The short story; ntl barfed looking for /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.2/crtbeginS.o
    
    even though I had gcc-4.5.3 installed. A quick look in /usr/lib/gcc/x86_64-pc-linux-gnu and
    there were remnants of old gcc's laying around each with a symlink pointing to
    /usr/bin/cpp. In fact the only thing in there was a cpp.
    
    Putting the contents of the POST_INSTALL in each of the BUILDs and removing the PSOT_INSTALL.
    
    Think very carefully of what you put in POST_INSTALL because as in this case; file changes
    will not be tracked.
---
 compilers/gcc/BUILD        |   14 +++++++++++++-
 compilers/gcc/BUILD.x86_64 |   14 +++++++++++++-
 compilers/gcc/POST_INSTALL |    8 --------
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/compilers/gcc/BUILD b/compilers/gcc/BUILD
index a46d496..c9023a9 100644
--- a/compilers/gcc/BUILD
+++ b/compilers/gcc/BUILD
@@ -31,6 +31,18 @@
 
   make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&
   prepare_install  &&
-  make install
+  make install &&
+
+# This used to be the POST_INSTALL and it really should not have. Doing this sort of thing means
+# these files will not be tracked; that is a no-no-no.
+
+  cd /usr/lib/gcc/$BUILD/$VERSION  &&
+  ln    -sf /usr/bin/cpp cpp       &&
+  cd /lib/                         &&
+  ln    -sf /usr/bin/cpp cpp       && 
+
+  if [ ! -e /usr/bin/cc ] ; then
+  ln -s gcc /usr/bin/cc
+  fi
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/gcc/BUILD.x86_64 b/compilers/gcc/BUILD.x86_64
index 513da53..9993d28 100644
--- a/compilers/gcc/BUILD.x86_64
+++ b/compilers/gcc/BUILD.x86_64
@@ -33,6 +33,18 @@
 
   make CFLAGS='-O' LIBCFLAGS='-g -O2' LIBCXXFLAGS='-g -O2 -fno-implicit-templates' bootstrap-lean  &&
   prepare_install  &&
-  make install
+  make install &&
+
+# This used to be the POST_INSTALL and it really should not have. Doing this sort of thing means
+# these files will not be tracked; that is a no-no-no.
+
+  cd /usr/lib/gcc/$BUILD/$VERSION  &&
+  ln    -sf /usr/bin/cpp cpp       &&
+  cd /lib/                         &&
+  ln    -sf /usr/bin/cpp cpp       &&
+
+  if [ ! -e /usr/bin/cc ] ; then
+  ln -s gcc /usr/bin/cc
+  fi
 
 ) > $C_FIFO 2>&1
diff --git a/compilers/gcc/POST_INSTALL b/compilers/gcc/POST_INSTALL
deleted file mode 100644
index 6179464..0000000
--- a/compilers/gcc/POST_INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-cd /usr/lib/gcc/$BUILD/$VERSION  &&
-ln    -sf /usr/bin/cpp cpp       &&
-cd /lib/                         &&
-ln    -sf /usr/bin/cpp cpp       && 
-
-if [ ! -e /usr/bin/cc ] ; then
-  ln -s gcc /usr/bin/cc
-fi || true