diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2004-06-19 11:00:52 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2004-06-19 11:00:52 +0000 |
| commit | b4a1655de7edbacb1304fe6fa08574fab34d0b9a (patch) | |
| tree | f092ca95cbd7b430af62c83d693d1b83d786ef79 /GNUmakefile | |
| parent | 4291b1ca1a471e146fb7e31767423a23f5b0f097 (diff) | |
| download | cryptopp-b4a1655de7edbacb1304fe6fa08574fab34d0b9a.tar.gz | |
disable x86 assembly on systems without GNU as 2.10 or later
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@171 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index bbdfb2b..c3c00e0 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,12 +16,21 @@ ifeq ($(CXX),gcc) # for some reason CXX is gcc on cygwin 1.1.4 CXX = g++ endif +ifeq ($(ISX86),1) + GCC33ORLATER = $(shell $(CXX) -v 2>&1 | grep -c "gcc version \(3.[3-9]\|[4-9]\)") +GAS210ORLATER = $(shell echo "" | $(AS) -v 2>&1 | grep -c "GNU assembler version \(2.[1-9][0-9]\|[3-9]\)") -ifeq ($(ISX86) $(GCC33ORLATER) $(ISMINGW),1 1 0) # MINGW32 is missing the memalign function +ifeq ($(GCC33ORLATER) $(ISMINGW),1 0) # MINGW32 is missing the memalign function CXXFLAGS += -msse2 endif +ifeq ($(GAS210ORLATER),0) # .intel_syntax wasn't supported until GNU assembler 2.10 +CXXFLAGS += -DCRYPTOPP_DISABLE_X86ASM +endif + +endif + ifeq ($(ISMINGW),1) LDLIBS += -lws2_32 endif |