aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated Makefile for reverce LLVM_3_6 flag

Browse Source
This commit is contained in:
Anton Mitrokhin
2014-08-01 16:07:52 +04:00
parent 60fa76ccc1
commit d64e1bcd82
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -114,8 +114,8 @@ ifeq ($(LLVM_VERSION),LLVM_3_4)
endif endif
# There is no logical OR in GNU make. # There is no logical OR in GNU make.
# This 'ifneq' acts like if($(LLVM_VERSION) == LLVM_3_5 || $(LLVM_VERSION) == LLVM_3_6) # This 'ifneq' acts like if( !($(LLVM_VERSION) == LLVM_3_2 || $(LLVM_VERSION) == LLVM_3_3 || $(LLVM_VERSION) == LLVM_3_4))
ifneq (,$(filter $(LLVM_VERSION), LLVM_3_5 LLVM_3_6)) ifeq (,$(filter $(LLVM_VERSION), LLVM_3_2 LLVM_3_3 LLVM_3_4))
ISPC_LIBS += -lcurses -lz ISPC_LIBS += -lcurses -lz
endif endif
@@ -153,10 +153,11 @@ CXXFLAGS=$(OPT) $(LLVM_CXXFLAGS) -I. -Iobjs/ -I$(CLANG_INCLUDE) \
-DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_VERSION="\"$(BUILD_VERSION)\"" \ -DBUILD_DATE="\"$(BUILD_DATE)\"" -DBUILD_VERSION="\"$(BUILD_VERSION)\"" \
-Wno-sign-compare -Wno-unused-function -Werror -Wno-sign-compare -Wno-unused-function -Werror
# if($(LLVM_VERSION) == LLVM_3_5 || $(LLVM_VERSION) == LLVM_3_6) # if( !($(LLVM_VERSION) == LLVM_3_2 || $(LLVM_VERSION) == LLVM_3_3 || $(LLVM_VERSION) == LLVM_3_4))
ifneq (,$(filter $(LLVM_VERSION), LLVM_3_5 LLVM_3_6)) ifeq (,$(filter $(LLVM_VERSION), LLVM_3_2 LLVM_3_3 LLVM_3_4))
CXXFLAGS+=-std=c++11 -Wno-c99-extensions -Wno-deprecated-register ISPC_LIBS += -lcurses -lz
endif endif
ifneq ($(ARM_ENABLED), 0) ifneq ($(ARM_ENABLED), 0)
CXXFLAGS+=-DISPC_ARM_ENABLED CXXFLAGS+=-DISPC_ARM_ENABLED
endif endif