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

Guard use of MacPorts GCC and -DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER

pull/339/head
Jeffrey Walton 2016-10-25 22:42:04 -04:00
parent de6f4d56ec
commit 29dae707fd
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile
View File

@ -187,10 +187,10 @@ endif
# Tell MacPorts GCC to use Clang integrated assembler # Tell MacPorts GCC to use Clang integrated assembler
# http://github.com/weidai11/cryptopp/issues/190 # http://github.com/weidai11/cryptopp/issues/190
ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER),11) ifeq ($(GCC_COMPILER)$(MACPORTS_COMPILER),11)
ifneq ($(findstring -Wa,-q,$(CXXFLAGS)),-Wa,-q) ifeq ($(findstring -Wa,-q,$(CXXFLAGS)),)
CXXFLAGS += -Wa,-q CXXFLAGS += -Wa,-q
endif endif
ifneq ($(findstring -Wa,-q,$(CXXFLAGS)),-DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER) ifeq ($(findstring -DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER,$(CXXFLAGS)),)
CXXFLAGS += -DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER=1 CXXFLAGS += -DCRYPTOPP_CLANG_INTEGRATED_ASSEMBLER=1
endif endif
endif endif
@ -198,8 +198,10 @@ endif
# GCC on Solaris needs -m64. Otherwise, i386 is default # GCC on Solaris needs -m64. Otherwise, i386 is default
# http://github.com/weidai11/cryptopp/issues/230 # http://github.com/weidai11/cryptopp/issues/230
ifeq ($(IS_SUN)$(GCC_COMPILER)$(IS_X64),111) ifeq ($(IS_SUN)$(GCC_COMPILER)$(IS_X64),111)
ifeq ($(findstring -m32,$(CXXFLAGS)),)
CXXFLAGS += -m64 CXXFLAGS += -m64
endif endif
endif
# Allow use of "/" operator for GNU Assembler. # Allow use of "/" operator for GNU Assembler.
# http://sourceware.org/bugzilla/show_bug.cgi?id=4572 # http://sourceware.org/bugzilla/show_bug.cgi?id=4572