Merge branch 'master' into nlewycky/singlepass-globalget-fp

This commit is contained in:
nlewycky 2020-04-16 18:11:24 -07:00 committed by GitHub
commit 968888abba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -28,14 +28,14 @@ ifeq ($(ARCH), x86_64)
# LLVM could be enabled if not in Windows # LLVM could be enabled if not in Windows
ifneq ($(OS), Windows_NT) ifneq ($(OS), Windows_NT)
# Autodetect LLVM from llvm-config # Autodetect LLVM from llvm-config
ifeq (, $(shell which llvm-config)) ifneq (, $(shell which llvm-config))
LLVM_VERSION := $(shell llvm-config --version) LLVM_VERSION := $(shell llvm-config --version)
# If findstring is not empty, then it have found the value # If findstring is not empty, then it have found the value
ifneq (, $(findstring 8,$(LLVM_VERSION))$(findstring 9,$(LLVM_VERSION))) ifneq (, $(findstring 8,$(LLVM_VERSION))$(findstring 9,$(LLVM_VERSION)))
backends += llvm backends += llvm
endif endif
else else
ifeq (, $(shell which llvm-config-8)) ifneq (, $(shell which llvm-config-8))
backends += llvm backends += llvm
endif endif
endif endif