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

use egrep instead of grep

pull/2/head
weidai 2006-12-12 08:42:19 +00:00
parent 80b7c5fa48
commit 5184d7c8f3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GNUmakefile
View File

@ -12,8 +12,8 @@ RANLIB = ranlib
CP = cp CP = cp
MKDIR = mkdir MKDIR = mkdir
UNAME = $(shell uname) UNAME = $(shell uname)
ISX86 = $(shell uname -m | grep -c "i.86\|x86") ISX86 = $(shell uname -m | egrep -c "i.86|x86")
ISMINGW = $(shell uname | grep -c "MINGW32") ISMINGW = $(shell uname | egrep -c "MINGW32")
# Default prefix for make install # Default prefix for make install
ifeq ($(PREFIX),) ifeq ($(PREFIX),)
@ -26,8 +26,8 @@ endif
ifeq ($(ISX86),1) ifeq ($(ISX86),1)
GCC33ORLATER = $(shell $(CXX) -v 2>&1 | grep -c "gcc version \(3.[3-9]\|[4-9]\)") GCC33ORLATER = $(shell $(CXX) -v 2>&1 | egrep -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]\)") GAS210ORLATER = $(shell echo "" | $(AS) -v 2>&1 | egrep -c "GNU assembler version (2.[1-9][0-9]|[3-9])")
ifeq ($(GCC33ORLATER) $(ISMINGW),1 0) # MINGW32 is missing the memalign function ifeq ($(GCC33ORLATER) $(ISMINGW),1 0) # MINGW32 is missing the memalign function
CXXFLAGS += -msse2 CXXFLAGS += -msse2
@ -58,7 +58,7 @@ AR = libtool
ARFLAGS = -static -o ARFLAGS = -static -o
CXX = c++ CXX = c++
CXXFLAGS += -D__pic__ CXXFLAGS += -D__pic__
IS_GCC2 = $(shell $(CXX) -v 2>&1 | grep -c gcc-932) IS_GCC2 = $(shell $(CXX) -v 2>&1 | egrep -c gcc-932)
ifeq ($(IS_GCC2),1) ifeq ($(IS_GCC2),1)
CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables
LDLIBS += -lstdc++ LDLIBS += -lstdc++