From cecd2fd66c0e5f468854381361dad624cd93434a Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 1 Dec 2018 04:02:15 -0500 Subject: [PATCH] Remove language dependent BAD_RESULT variable from Makefile --- GNUmakefile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 842d3c8a..d5f4b530 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -100,9 +100,6 @@ ifeq ($(wildcard adhoc.cpp),) $(shell cp adhoc.cpp.proto adhoc.cpp) 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 DETECT_FEATURES ?= 1 ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),-DCRYPTOPP_DISABLE_ASM) @@ -134,6 +131,16 @@ ifeq ($(IS_AIX),1) 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 ##### ########################################################### @@ -792,16 +799,6 @@ ifeq ($(IS_LINUX),1) endif # OpenMP 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 ifneq ($(SUN_COMPILER),0) # override flags for CC Sun C++ compiler # Add to all Solaris