Selaa lähdekoodia

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
Daniel Dunbar 15 vuotta sitten
vanhempi
commit
bc817cffbc
3 muutettua tiedostoa jossa 7 lisäystä ja 3 poistoa
  1. 2 1
      docs/tools/Makefile
  2. 2 1
      lib/Headers/Makefile
  3. 3 1
      lib/Runtime/Makefile

+ 2 - 1
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)/

+ 2 - 1
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
 

+ 3 - 1
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)