[llvm-commits] [dragonegg] r142613 - in /dragonegg/branches/release_30: ./ Makefile

[Bill Wendling]

Author: void
Date: Thu Oct 20 15:29:47 2011
New Revision: 142613

URL: http://llvm.org/viewvc/llvm-project?rev=142613&view=rev
Log:
Merging r142575:
------------------------------------------------------------------------
r142575 | baldrick | 2011-10-20 03:28:38 -0700 (Thu, 20 Oct 2011) | 3 lines

If there is no micro version (i.e. gcc reports itself to be version 4.6 rather
than 4.6.0) ensure the micro version is zero, avoiding a compile failure.

------------------------------------------------------------------------

Modified:
    dragonegg/branches/release_30/   (props changed)
    dragonegg/branches/release_30/Makefile

Propchange: dragonegg/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 20 15:29:47 2011
@@ -1 +1 @@
-/dragonegg/trunk:142351
+/dragonegg/trunk:142351,142575

Modified: dragonegg/branches/release_30/Makefile
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_30/Makefile?rev=142613&r1=142612&r2=142613&view=diff
==============================================================================
--- dragonegg/branches/release_30/Makefile (original)
+++ dragonegg/branches/release_30/Makefile Thu Oct 20 15:29:47 2011
@@ -31,7 +31,7 @@
 endif
 
 GCC_PLUGIN_DIR:=$(shell $(GCC) -print-file-name=plugin)
-GCC_VERSION:=$(shell $(GCC) -dumpversion)
+GCC_VERSION:=$(shell $(GCC) -dumpversion).0
 GCC_MAJOR=$(word 1, $(subst ., ,$(GCC_VERSION)))
 GCC_MINOR=$(word 2, $(subst ., ,$(GCC_VERSION)))
 GCC_MICRO=$(word 3, $(subst ., ,$(GCC_VERSION)))