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

Merge 8a2ad739aa into 2b4ec92dbe

pull/354/merge
Marius Bakke 2017-03-12 20:01:48 +00:00 committed by GitHub
parent 2b4ec92dbe 8a2ad739aa
commit 9d9191cd6d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
GNUmakefile
View File

@ -50,8 +50,6 @@ IS_X86 := $(shell isainfo -k 2>/dev/null | grep -i -c "i386")
IS_X64 := $(shell isainfo -k 2>/dev/null | grep -i -c "amd64") IS_X64 := $(shell isainfo -k 2>/dev/null | grep -i -c "amd64")
endif endif
DISABLE_CXXFLAGS_OPTIMIZATIONS := 0
########################################################### ###########################################################
##### General Variables ##### ##### General Variables #####
########################################################### ###########################################################
@ -131,6 +129,8 @@ endif
# BEGIN MARCH_CXXFLAGS # BEGIN MARCH_CXXFLAGS
# Guard use of -march=native (or -m{32|64} on some platforms) # Guard use of -march=native (or -m{32|64} on some platforms)
# Don't add anything if -march=XXX or -mtune=XXX is specified # Don't add anything if -march=XXX or -mtune=XXX is specified
# or DISABLE_CXXFLAGS_OPTIMIZATIONS is set.
ifeq ($(DISABLE_CXXFLAGS_OPTIMIZATIONS),)
ifeq ($(findstring -march,$(CXXFLAGS)),) ifeq ($(findstring -march,$(CXXFLAGS)),)
ifeq ($(findstring -mtune,$(CXXFLAGS)),) ifeq ($(findstring -mtune,$(CXXFLAGS)),)
ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
@ -150,6 +150,7 @@ ifeq ($(findstring -mtune,$(CXXFLAGS)),)
endif endif
endif # -mtune endif # -mtune
endif # -march endif # -march
endif # DISABLE_CXXFLAGS_OPTIMIZATIONS
# END MARCH_CXXFLAGS # END MARCH_CXXFLAGS
# Cygwin needs _XOPEN_SOURCE for signals # Cygwin needs _XOPEN_SOURCE for signals
@ -594,7 +595,8 @@ ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),)
$(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR) $(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)
@-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX) @-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
$(LDCONF) $(DESTDIR)$(LIBDIR) $(LDCONF) $(DESTDIR)$(LIBDIR)
endif endif
endif endif