diff options
| author | gingerBill <bill@gingerbill.org> | 2022-02-28 12:32:51 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2022-02-28 12:32:51 +0000 |
| commit | 45124e4d5c19d477c2fc80282e153cc0bb7ac6ff (patch) | |
| tree | b5bd3d72b4b5f7909f67d65358e6e3ad25fb8714 /Makefile | |
| parent | 32988b03632912bbdb788e3dc319592a1dab9bfe (diff) | |
| parent | 7681c43b144015278b75b2788b824a5630f6ccd6 (diff) | |
Merge branch 'master' into freestanding_amd64
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
@@ -10,7 +10,7 @@ OS=$(shell uname) ifeq ($(OS), Darwin) ARCH=$(shell uname -m) - LLVM_CONFIG= + LLVM_CONFIG=llvm-config # allow for arm only llvm's with version 13 ifeq ($(ARCH), arm64) @@ -27,9 +27,7 @@ ifeq ($(OS), Darwin) LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR = $(subst ",,$(LLVM_VERSION_PATTERN_REMOVE_ELEMENTS)) LLVM_VERSION_PATTERN = "^(($(LLMV_VERSION_PATTERN_REMOVE_SINGLE_STR)))" - ifneq ($(shell llvm-config --version | grep -E $(LLVM_VERSION_PATTERN)),) - LLVM_CONFIG=llvm-config - else + ifeq ($(shell $(LLVM_CONFIG) --version | grep -E $(LLVM_VERSION_PATTERN)),) ifeq ($(ARCH), arm64) $(error "Requirement: llvm-config must be base version 13 for arm64") else @@ -48,9 +46,7 @@ ifeq ($(OS), Linux) else ifneq ($(shell which llvm-config-11-64 2>/dev/null),) LLVM_CONFIG=llvm-config-11-64 else - ifneq ($(shell llvm-config --version | grep '^11\.'),) - LLVM_CONFIG=llvm-config - else + ifeq ($(shell $(LLVM_CONFIG) --version | grep '^11\.'),) $(error "Requirement: llvm-config must be version 11") endif endif |