* Allow purify builds to be enabled without hacking the makefile. Now you

  just have to run: make ENABLE_PURIFY=1
* Add command to the link line that makes the broken GCC 3.0 compiler work
  without affecting 2.95.3

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2116 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index a294df77ce645e9faa54291e1369323de4de72ac..a3ac71968cc966f3caf635b73c46f778e159000d 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -63,8 +63,11 @@ CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnon
 # Link final executable
 
 # To enable purify, do it here:
-###Link     = $(PURIFY) $(CXX) $(Prof) -static
-Link     = $(CXX) $(Prof) 
+ifdef ENABLE_PURIFY
+Link     = $(PURIFY) $(CXX) $(Prof) -static
+else
+Link     = LD_RUN_PATH=/usr/dcs/software/evaluation/encap/gcc-3.0.4/lib $(CXX) $(Prof) 
+endif
 LinkG    = $(Link) -g  -L $(LEVEL)/lib/Debug
 LinkO    = $(Link) -O3 -L $(LEVEL)/lib/Release
 

diff --git a/Makefile.rules b/Makefile.rules
index a294df77ce645e9faa54291e1369323de4de72ac..a3ac71968cc966f3caf635b73c46f778e159000d 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -63,8 +63,11 @@ CompileO = $(Compile) -O3 -DNDEBUG -finline-functions -felide-constructors -fnon
 # Link final executable
 
 # To enable purify, do it here:
-###Link     = $(PURIFY) $(CXX) $(Prof) -static
-Link     = $(CXX) $(Prof) 
+ifdef ENABLE_PURIFY
+Link     = $(PURIFY) $(CXX) $(Prof) -static
+else
+Link     = LD_RUN_PATH=/usr/dcs/software/evaluation/encap/gcc-3.0.4/lib $(CXX) $(Prof) 
+endif
 LinkG    = $(Link) -g  -L $(LEVEL)/lib/Debug
 LinkO    = $(Link) -O3 -L $(LEVEL)/lib/Release