From bc817cffbca01c879f13e9290d94797f6caafc7a Mon Sep 17 00:00:00 2001 From: Daniel Dunbar <daniel@zuster.org> Date: Fri, 25 Jun 2010 17:33:49 +0000 Subject: [PATCH] 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 --- docs/tools/Makefile | 3 ++- lib/Headers/Makefile | 3 ++- lib/Runtime/Makefile | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/tools/Makefile b/docs/tools/Makefile index 4cffc45fe0a..5521d6b764c 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 79c5b3a2d99..45c77097fdc 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 1b258184af3..347df9ba7e6 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) -- GitLab