build: Get CLANG_VERSION from Version.inc instead of depending on VER file directly.

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

diff --git a/docs/tools/Makefile b/docs/tools/Makefile
index 4cffc45fe0a67522aec7e92b5c58314fa6b6d653..5521d6b764c961f8eef983b7b84eb212666e472f 100644 (file)
--- a/docs/tools/Makefile
+++ b/docs/tools/Makefile
@@ -40,7 +40,8 @@ else
 CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+       $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
 
 SRC_DOC_DIR=$(PROJ_SRC_DIR)/
 DST_HTML_DIR=$(PROJ_OBJ_DIR)/

diff --git a/lib/Headers/Makefile b/lib/Headers/Makefile
index 79c5b3a2d99576dfd0f686bf7eb607390d800cd5..45c77097fdc0daf1368f3cd13925a202828adb64 100644 (file)
--- a/lib/Headers/Makefile
+++ b/lib/Headers/Makefile
@@ -14,7 +14,8 @@ TABLEGEN_INC_FILES_COMMON = 1
 
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+       $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
 
 HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
 

diff --git a/lib/Runtime/Makefile b/lib/Runtime/Makefile
index 1b258184af3d1da1c42747767b74f5cf3031194c..347df9ba7e6aab821a4508dbc4518626ac602170 100644 (file)
--- a/lib/Runtime/Makefile
+++ b/lib/Runtime/Makefile
@@ -16,7 +16,9 @@
 CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
-CLANG_VERSION := $(shell cat $(PROJ_SRC_DIR)/../../VER)
+CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \
+       $(PROJ_OBJ_DIR)/$(CLANG_LEVEL)/include/clang/Basic/Version.inc))
+
 ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
 PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)