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

Move HAS_NEWLIB down to _XOPEN_SOURCE test

pull/739/head
Jeffrey Walton 2018-11-11 11:54:58 -05:00
parent 74ee0eef7e
commit de75959fd7
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GNUmakefile
View File

@ -89,10 +89,6 @@ ifneq ($(IS_LINUX)$(IS_SUN),00)
HAS_SOLIB_VERSION := 1 HAS_SOLIB_VERSION := 1
endif endif
# Newlib needs _XOPEN_SOURCE=600 for signals
TPROG = TestPrograms/test_cxx.cxx
HAS_NEWLIB := $(shell $(CXX) $(CXXFLAGS) -dM -E $(TPROG) 2>&1 | $(GREP) -i -c "__NEWLIB__")
# Formely adhoc.cpp was created from adhoc.cpp.proto when needed. # Formely adhoc.cpp was created from adhoc.cpp.proto when needed.
ifeq ($(wildcard adhoc.cpp),) ifeq ($(wildcard adhoc.cpp),)
$(shell cp adhoc.cpp.proto adhoc.cpp) $(shell cp adhoc.cpp.proto adhoc.cpp)
@ -157,10 +153,13 @@ ifeq ($(ARFLAGS),rv)
ARFLAGS = r ARFLAGS = r
endif endif
# Newlib needs _XOPEN_SOURCE=600 for signals
TPROG = TestPrograms/test_cxx.cxx
HAS_NEWLIB := $(shell $(CXX) $(CXXFLAGS) -dM -E $(TPROG) 2>&1 | $(GREP) -i -c "__NEWLIB__")
ifneq ($(HAS_NEWLIB),0) ifneq ($(HAS_NEWLIB),0)
ifeq ($(findstring -D_XOPEN_SOURCE,$(CXXFLAGS)),) ifeq ($(findstring -D_XOPEN_SOURCE,$(CXXFLAGS)),)
CXXFLAGS += -D_XOPEN_SOURCE=600 CXXFLAGS += -D_XOPEN_SOURCE=600
endif endif
endif endif
# Clang integrated assembler will be used with -Wa,-q # Clang integrated assembler will be used with -Wa,-q
@ -228,7 +227,6 @@ ifeq ($(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS)),)
TPROG = TestPrograms/test_sse41.cxx TPROG = TestPrograms/test_sse41.cxx
TOPT = -msse4.1 TOPT = -msse4.1
HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT)) HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TOPT) $(TPROG) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT))
TOPT = -msse4.1
ifeq ($(HAVE_OPT),0) ifeq ($(HAVE_OPT),0)
BLAKE2B_FLAG = -msse4.1 BLAKE2B_FLAG = -msse4.1
BLAKE2S_FLAG = -msse4.1 BLAKE2S_FLAG = -msse4.1