diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2010-06-25 17:33:49 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2010-06-25 17:33:49 +0000 |
| commit | 283fe3d07a51872a607dad46f2e2ba918c0a0108 (patch) | |
| tree | 486539eba15454679a69cf233ca789e0ef139f0a /clang | |
| parent | c3275c5440babcc39b10357fe636b8da3ac2f62d (diff) | |
| download | bcm5719-llvm-283fe3d07a51872a607dad46f2e2ba918c0a0108.tar.gz bcm5719-llvm-283fe3d07a51872a607dad46f2e2ba918c0a0108.zip | |
build: Get CLANG_VERSION from Version.inc instead of depending on VER file directly.
llvm-svn: 106864
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/docs/tools/Makefile | 3 | ||||
| -rw-r--r-- | clang/lib/Headers/Makefile | 3 | ||||
| -rw-r--r-- | clang/lib/Runtime/Makefile | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/clang/docs/tools/Makefile b/clang/docs/tools/Makefile index 4cffc45fe0a..5521d6b764c 100644 --- a/clang/docs/tools/Makefile +++ b/clang/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/clang/lib/Headers/Makefile b/clang/lib/Headers/Makefile index 79c5b3a2d99..45c77097fdc 100644 --- a/clang/lib/Headers/Makefile +++ b/clang/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/clang/lib/Runtime/Makefile b/clang/lib/Runtime/Makefile index 1b258184af3..347df9ba7e6 100644 --- a/clang/lib/Runtime/Makefile +++ b/clang/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) |
