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

Remove unused CLANG_INTEGRATED_ASSEMBLER from Makefile 

This is an artifact that should have been removed at CRYPTOPP_DISABLE_MIXED_ASM.
pull/853/head
Jeffrey Walton 2019-05-21 20:05:44 -04:00
parent f396ade93a
commit 879b8c6fe9
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GNUmakefile
View File

@ -164,6 +164,11 @@ else
ZOPT = -O0 ZOPT = -O0
endif endif
# Fix CXX on Cygwin 1.1.4
ifeq ($(CXX),gcc)
CXX := g++
endif
# On ARM we may compile aes_armv4.S though the CC compiler # On ARM we may compile aes_armv4.S though the CC compiler
ifeq ($(GCC_COMPILER),1) ifeq ($(GCC_COMPILER),1)
CC=gcc CC=gcc
@ -190,19 +195,11 @@ ifeq ($(INCLUDEDIR),)
INCLUDEDIR := $(PREFIX)/include INCLUDEDIR := $(PREFIX)/include
endif endif
# Fix CXX on Cygwin 1.1.4
ifeq ($(CXX),gcc)
CXX := g++
endif
# We honor ARFLAGS, but the "v" option used by default causes a noisy make # We honor ARFLAGS, but the "v" option used by default causes a noisy make
ifeq ($(ARFLAGS),rv) ifeq ($(ARFLAGS),rv)
ARFLAGS = r ARFLAGS = r
endif endif
# Clang integrated assembler will be used with -Wa,-q
CLANG_INTEGRATED_ASSEMBLER ?= 0
# Original MinGW targets Win2k by default, but lacks proper Win2k support # Original MinGW targets Win2k by default, but lacks proper Win2k support
# if target Windows version is not specified, use Windows XP instead # if target Windows version is not specified, use Windows XP instead
ifeq ($(IS_MINGW),1) ifeq ($(IS_MINGW),1)