Author: tbrethou
Date: Mon Jan 21 14:07:27 2008
New Revision: 46211
URL: http://llvm.org/viewvc/llvm-project?rev=46211&view=rev
Log:
Fix LLVM_VERSION_INFO so we get the correct version of llvm when building with
this option.
Modified:
llvm-gcc-4.2/trunk/build_gcc
llvm-gcc-4.2/trunk/gcc/version.c
Modified: llvm-gcc-4.2/trunk/build_gcc
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=46211&r1=46210&r2=46211&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Mon Jan 21 14:07:27 2008
@@ -181,7 +181,7 @@
if [ "$ENABLE_LLVM" == true ]; then
# Build llvm-gcc in 'dylib mode'.
MAKEFLAGS="$MAKEFLAGS BUILD_LLVM_INTO_A_DYLIB=1"
- MAKEFLAGS="$MAKEFLAGS LLVM_VERSION_INFO=$LLVM_GCC_SUBMIT_VERSION"
+ MAKEFLAGS="$MAKEFLAGS LLVM_VERSION_INFO=$LLVM_SUBMIT_VERSION"
fi
# LLVM LOCAL end
Modified: llvm-gcc-4.2/trunk/gcc/version.c
URL:
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/version.c?rev=46211&r1=46210&r2=46211&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/version.c (original)
+++ llvm-gcc-4.2/trunk/gcc/version.c Mon Jan 21 14:07:27 2008
@@ -9,7 +9,15 @@
the revision of your modified compiler. */
/* APPLE LOCAL begin Apple version */
-#define VERSUFFIX "(llvm) (Based on Apple Inc. build 5546)"
+#ifdef ENABLE_LLVM
+#ifdef LLVM_VERSION_INFO
+#define VERSUFFIX " (Based on Apple Inc. build 5546) (LLVM build "
LLVM_VERSION_INFO ")"
+#else
+#define VERSUFFIX " (Based on Apple Inc. build 5546) (LLVM build)"
+#endif
+#else
+#define VERSUFFIX " (Based on Apple Inc. build 5546)"
+#endif
/* APPLE LOCAL end Apple version */
/* This is the location of the online document giving instructions for
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
