From: Daniel Dunbar Date: Fri, 25 Jun 2010 17:33:49 +0000 (+0000) Subject: build: Get CLANG_VERSION from Version.inc instead of depending on VER file directly. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc817cffbca01c879f13e9290d94797f6caafc7a;p=clang 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 4cffc45fe0..5521d6b764 100644 --- 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 79c5b3a2d9..45c77097fd 100644 --- 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 1b258184af..347df9ba7e 100644 --- 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)