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

removed duplicatees in Makefile

Browse Source
This commit is contained in:
Anton Mitrokhin
2014-07-30 15:15:15 +04:00
parent f59a1db8b7
commit c0fc9b7aca
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@@ -113,11 +113,9 @@ ifeq ($(LLVM_VERSION),LLVM_3_4)
ISPC_LIBS += -lcurses ISPC_LIBS += -lcurses
endif endif
ifeq ($(LLVM_VERSION),LLVM_3_5) # There is no logical OR in GNU make.
ISPC_LIBS += -lcurses -lz # This 'ifneq' acts like if($(LLVM_VERSION) == LLVM_3_5 || $(LLVM_VERSION) == LLVM_3_6)
endif ifneq (,$(filter $(LLVM_VERSION), LLVM_3_5 LLVM_3_6))
ifeq ($(LLVM_VERSION),LLVM_3_6)
ISPC_LIBS += -lcurses -lz ISPC_LIBS += -lcurses -lz
endif endif
@@ -154,10 +152,9 @@ CXXFLAGS=$(OPT) $(LLVM_CXXFLAGS) -I. -Iobjs/ -I$(CLANG_INCLUDE) \
-Wall \ -Wall \
-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
ifeq ($(LLVM_VERSION),LLVM_3_5)
CXXFLAGS+=-std=c++11 -Wno-c99-extensions -Wno-deprecated-register # if($(LLVM_VERSION) == LLVM_3_5 || $(LLVM_VERSION) == LLVM_3_6)
endif ifneq (,$(filter $(LLVM_VERSION), LLVM_3_5 LLVM_3_6))
ifeq ($(LLVM_VERSION),LLVM_3_6)
CXXFLAGS+=-std=c++11 -Wno-c99-extensions -Wno-deprecated-register CXXFLAGS+=-std=c++11 -Wno-c99-extensions -Wno-deprecated-register
endif endif
ifneq ($(ARM_ENABLED), 0) ifneq ($(ARM_ENABLED), 0)