Skip to content

Commit

Permalink
Clear makefile variable TOPT as required
Browse files Browse the repository at this point in the history
  • Loading branch information
noloader committed May 19, 2021
1 parent 52f5bf8 commit f375910
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ ifeq ($(DETECT_FEATURES),1)
endif
TCOMMAND = $(CXX) $(TCXXFLAGS) $(TEXTRA) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT)
#TPROG = TestPrograms/test_cxx.cpp
#TOPT =
#$(info Testing compile... )
#$(info $(shell $(TCOMMAND)))
endif
Expand Down Expand Up @@ -216,6 +217,7 @@ endif # IS_MINGW

# Newlib needs _XOPEN_SOURCE=600 for signals
TPROG = TestPrograms/test_newlib.cpp
TOPT =
HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
ifeq ($(strip $(HAVE_OPT)),0)
ifeq ($(findstring -D_XOPEN_SOURCE,$(CXXFLAGS)),)
Expand Down Expand Up @@ -432,6 +434,7 @@ ifeq ($(DETECT_FEATURES),1)
# CRYPTOPP_DISABLE_MIXED_ASM is now being added in config_asm.h for all
# Clang compilers. This test will need to be re-enabled if Clang fixes it.
#TPROG = TestPrograms/test_asm_mixed.cpp
#TOPT =
#HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
#ifneq ($(strip $(HAVE_OPT)),0)
# CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_MIXED_ASM
Expand Down Expand Up @@ -1069,6 +1072,7 @@ endif # Valgrind
# Newlib test due to http://sourceware.org/bugzilla/show_bug.cgi?id=20268
ifneq ($(filter -DDEBUG -DDEBUG=1,$(CXXFLAGS)),)
TPROG = TestPrograms/test_cxx.cpp
TOPT =
USING_GLIBCXX := $(shell $(CXX)$(CXXFLAGS) -E $(TPROG) -c 2>&1 | $(GREP) -i -c "__GLIBCXX__")
ifneq ($(USING_GLIBCXX),0)
ifeq ($(HAS_NEWLIB),0)
Expand Down
2 changes: 2 additions & 0 deletions GNUmakefile-cross
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ ifeq ($(DETECT_FEATURES),1)
endif
TCOMMAND = $(CXX) $(TCXXFLAGS) $(TEXTRA) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT)
#TPROG = TestPrograms/test_cxx.cpp
#TOPT =
#$(info Testing compile... )
#$(info $(shell $(TCOMMAND)))
endif
Expand Down Expand Up @@ -382,6 +383,7 @@ ifeq ($(DETECT_FEATURES),1)
# CRYPTOPP_DISABLE_MIXED_ASM is now being added in config_asm.h for all
# Clang compilers. This test will need to be re-enabled if Clang fixes it.
#TPROG = TestPrograms/test_asm_mixed.cpp
#TOPT =
#HAVE_OPT = $(shell $(TCOMMAND) 2>&1 | wc -w)
#ifneq ($(strip $(HAVE_OPT)),0)
# CRYPTOPP_CXXFLAGS += -DCRYPTOPP_DISABLE_MIXED_ASM
Expand Down

0 comments on commit f375910

Please sign in to comment.