From b20e498fc5ec5134f055414578a562ff3c4fd044 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 26 Oct 2016 18:26:07 -0400 Subject: [PATCH] Additional use of $(strip $(CXXFLAGS)) cleanup --- GNUmakefile-cross | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GNUmakefile-cross b/GNUmakefile-cross index 9ea2bfe1..0d05c6f3 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -230,17 +230,17 @@ libcryptopp.so: libcryptopp.so$(SOLIB_VERSION_SUFFIX) endif libcryptopp.so$(SOLIB_VERSION_SUFFIX): $(LIBOBJS) - $(CXX) -shared $(SOLIB_FLAGS) -o $@ $(CXXFLAGS) -Wl,--exclude-libs,ALL $(LIBOBJS) $(LDFLAGS) $(LDLIBS) + $(CXX) -shared $(SOLIB_FLAGS) -o $@ $(strip $(CXXFLAGS)) -Wl,--exclude-libs,ALL $(LIBOBJS) $(LDFLAGS) $(LDLIBS) ifeq ($(HAS_SOLIB_VERSION),1) -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.so -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.so$(SOLIB_COMPAT_SUFFIX) endif libcryptopp.dylib: $(LIBOBJS) - $(CXX) -dynamiclib -o $@ $(CXXFLAGS) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" -headerpad_max_install_names $(LDFLAGS) $(LIBOBJS) + $(CXX) -dynamiclib -o $@ $(strip $(CXXFLAGS)) -install_name "$@" -current_version "$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH)" -compatibility_version "$(LIB_MAJOR).$(LIB_MINOR)" -headerpad_max_install_names $(LDFLAGS) $(LIBOBJS) cryptest.exe: libcryptopp.a $(TESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) + $(CXX) -o $@ $(strip $(CXXFLAGS)) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) # Used to generate list of source files for Autotools, CMakeList and Android.mk .PHONY: sources @@ -262,7 +262,7 @@ ifeq ($(wildcard GNUmakefile.deps),GNUmakefile.deps) endif # Dependencies %.o : %.cpp - $(CXX) $(CXXFLAGS) -c $< + $(CXX) $(strip $(CXXFLAGS)) -c $< GNUmakefile.deps: - $(CXX) $(CXXFLAGS) -MM *.cpp > GNUmakefile.deps + $(CXX) $(strip $(CXXFLAGS)) -MM *.cpp > GNUmakefile.deps