arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove language dependent BAD_RESULT variable from Makefile

pull/752/head
Jeffrey Walton 2018-12-01 04:02:15 -05:00
parent 41d4fcecbd
commit cecd2fd66c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
GNUmakefile
View File

@ -100,9 +100,6 @@ ifeq ($(wildcard adhoc.cpp),)
$(shell cp adhoc.cpp.proto adhoc.cpp) $(shell cp adhoc.cpp.proto adhoc.cpp)
endif endif
# For feature tests
BAD_RESULT="fatal|error|unknown|unrecognized|unexpected|illegal|ignored|incorrect|not found|not exist|cannot find|not supported|not compatible|no such instruction|invalid mnemonic"
# Hack to skip CPU feature tests for some recipes # Hack to skip CPU feature tests for some recipes
DETECT_FEATURES ?= 1 DETECT_FEATURES ?= 1
ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),-DCRYPTOPP_DISABLE_ASM) ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),-DCRYPTOPP_DISABLE_ASM)
@ -134,6 +131,16 @@ ifeq ($(IS_AIX),1)
endif endif
endif endif
# libc++ is LLVM's standard C++ library. If we add libc++
# here then all user programs must use it too. The open
# question is, which choice is easier on users?
ifneq ($(IS_DARWIN),0)
CXX ?= c++
# CXXFLAGS += -stdlib=libc++
AR = libtool
ARFLAGS = -static -o
endif
########################################################### ###########################################################
##### General Variables ##### ##### General Variables #####
########################################################### ###########################################################
@ -792,16 +799,6 @@ ifeq ($(IS_LINUX),1)
endif # OpenMP endif # OpenMP
endif # IS_LINUX endif # IS_LINUX
# libc++ is LLVM's standard C++ library. If we add libc++
# here then all user programs must use it too. The open
# question is, which choice is easier on users?
ifneq ($(IS_DARWIN),0)
CXX ?= c++
# CXXFLAGS += -stdlib=libc++
AR = libtool
ARFLAGS = -static -o
endif
# Add -errtags=yes to get the name for a warning suppression # Add -errtags=yes to get the name for a warning suppression
ifneq ($(SUN_COMPILER),0) # override flags for CC Sun C++ compiler ifneq ($(SUN_COMPILER),0) # override flags for CC Sun C++ compiler
# Add to all Solaris # Add to all Solaris