[llvm-commits] [dragonegg] r148398 - in /dragonegg/trunk: extras/do_self_strap src/Backend.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Jan 18 10:51:08 2012
New Revision: 148398

URL: http://llvm.org/viewvc/llvm-project?rev=148398&view=rev
Log:
Remove support for dragonegg_disable_version_check, and use the
new method of not compiling version checking code at all in the
buildbot self-host script.

Modified:
    dragonegg/trunk/extras/do_self_strap
    dragonegg/trunk/src/Backend.cpp

Modified: dragonegg/trunk/extras/do_self_strap
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/extras/do_self_strap?rev=148398&r1=148397&r2=148398&view=diff
==============================================================================
--- dragonegg/trunk/extras/do_self_strap (original)
+++ dragonegg/trunk/extras/do_self_strap Wed Jan 18 10:51:08 2012
@@ -61,10 +61,6 @@
 MAKE_INSTALL="nice -n 20 make install"	# How to run make install
 
 
-# Turn off plugin version checking, otherwise the check may fail if all stages
-# are not built on the same day, since the version contains the build date.
-export dragonegg_disable_version_check=yes
-
 # Check out or update the dragonegg source
 if [ ! -e $DRAGONEGG_SOURCE ] ; then
   echo "Checking out dragonegg"
@@ -181,7 +177,8 @@
   mkdir -p $DRAGONEGG_BUILD-pre
   cd $DRAGONEGG_BUILD-pre
   $MAKE -f $DRAGONEGG_SOURCE/Makefile clean
-  TOP_DIR=$DRAGONEGG_SOURCE $MAKE -f $DRAGONEGG_SOURCE/Makefile VERBOSE=1
+  TOP_DIR=$DRAGONEGG_SOURCE $MAKE -f $DRAGONEGG_SOURCE/Makefile VERBOSE=1 \
+    DISABLE_VERSION_CHECK=1
   # <== end: Build dragonegg using the just built GCC and DRAGONEGG.
 
 

Modified: dragonegg/trunk/src/Backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/src/Backend.cpp?rev=148398&r1=148397&r2=148398&view=diff
==============================================================================
--- dragonegg/trunk/src/Backend.cpp (original)
+++ dragonegg/trunk/src/Backend.cpp Wed Jan 18 10:51:08 2012
@@ -1993,11 +1993,6 @@
 #ifndef DISABLE_VERSION_CHECK
 static bool version_check(struct plugin_gcc_version *gcc_version,
                           struct plugin_gcc_version *plugin_version) {
-  // Make it possible to turn off the version check - useful for testing gcc
-  // bootstrap.
-  if (getenv("dragonegg_disable_version_check"))
-    return true;
-
   // Check that the running gcc has exactly the same version as the gcc we were
   // built against.  This strict check seems wise when developing against a fast
   // moving gcc tree.  TODO: Use a milder check if doing a "release build".