Skip to content
Snippets Groups Projects
Commit bc817cff authored by Daniel Dunbar's avatar Daniel Dunbar
Browse files

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
parent a5107679
No related branches found
No related tags found
No related merge requests found
...@@ -40,7 +40,8 @@ else ...@@ -40,7 +40,8 @@ else
CLANG_LEVEL := ../.. CLANG_LEVEL := ../..
include $(CLANG_LEVEL)/Makefile 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)/ SRC_DOC_DIR=$(PROJ_SRC_DIR)/
DST_HTML_DIR=$(PROJ_OBJ_DIR)/ DST_HTML_DIR=$(PROJ_OBJ_DIR)/
......
...@@ -14,7 +14,8 @@ TABLEGEN_INC_FILES_COMMON = 1 ...@@ -14,7 +14,8 @@ TABLEGEN_INC_FILES_COMMON = 1
include $(CLANG_LEVEL)/Makefile 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 HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
......
...@@ -16,7 +16,9 @@ ...@@ -16,7 +16,9 @@
CLANG_LEVEL := ../.. CLANG_LEVEL := ../..
include $(CLANG_LEVEL)/Makefile 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) ResourceDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)
PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION) PROJ_resources := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment