Remove hardcoded GCC optimization flags

Forwarded: not-needed
Last-Update: 2015-11-17

This is necessary in order to make DEB_BUILD_OPTIONS=noopt work as expected.

Note that the hack on llvm-config --cxxflags is not absolutely needed, because
the -O2 that it brings come before the -O0 brought by dpkg-buildflags. But I
leave it for clarity.
Last-Update: 2015-11-17
Gbp-Pq: Name support-noopt.patch

diff --git a/Make.inc b/Make.inc
index 2f0d52feb99d40f5793e09a3cc59ba40f08be0f7..361e2e00014a474beebcf624159137c20f74c6d9 100644 (file)
--- a/Make.inc
+++ b/Make.inc
@@ -469,7 +469,7 @@ ifneq ($(OS), WINNT)
 JCXXFLAGS += -pedantic
 endif
 DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
-SHIPFLAGS := -O3 -ggdb2 -falign-functions
+SHIPFLAGS := -ggdb2 -falign-functions
 endif
 
 ifeq ($(USECLANG),1)

diff --git a/deps/suitesparse.mk b/deps/suitesparse.mk
index de246a5f05f70372bab1a5aa3eb3d164902a2625..69304812efcd00ec4f4f25e2d353b11065106322 100644 (file)
--- a/deps/suitesparse.mk
+++ b/deps/suitesparse.mk
@@ -119,7 +119,7 @@ endif
 
 $(build_shlibdir)/libsuitesparse_wrapper.$(SHLIB_EXT): $(SRCDIR)/SuiteSparse_wrapper.c
        mkdir -p $(build_shlibdir)
-       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -O2 -shared $(fPIC) $(SUITESPARSE_INC) $< -o $@ $(SUITESPARSE_LIB)
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $(fPIC) $(SUITESPARSE_INC) $< -o $@ $(SUITESPARSE_LIB)
        $(INSTALL_NAME_CMD)libsuitesparse_wrapper.$(SHLIB_EXT) $@
        touch -c $@
 

diff --git a/src/Makefile b/src/Makefile
index ce846ca5a067ada8754d14a61401033484f4142d..04d1cd1e28bfbbeac25ad8158bbb35faabea9b5a 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -150,7 +150,7 @@ $(BUILDDIR)/%.o: $(SRCDIR)/%.c $(HEADERS) | $(BUILDDIR)
 $(BUILDDIR)/%.dbg.obj: $(SRCDIR)/%.c $(HEADERS) | $(BUILDDIR)
        @$(call PRINT_CC, $(CC) $(JCPPFLAGS) $(JCFLAGS) $(DEBUGFLAGS) -c $< -o $@)
 $(BUILDDIR)/%.o: $(SRCDIR)/%.cpp $(SRCDIR)/llvm-version.h $(HEADERS) $(LLVM_CONFIG_ABSOLUTE) | $(BUILDDIR)
-       @$(call PRINT_CC, $(CXX) $(shell $(LLVM_CONFIG_HOST) --cxxflags) $(JCPPFLAGS) $(JCXXFLAGS) $(SHIPFLAGS) $(CXX_DISABLE_ASSERTION) -c $< -o $@)
+       @$(call PRINT_CC, $(CXX) $(shell $(LLVM_CONFIG_HOST) --cxxflags | sed 's/^/ /;s/$$/ /;s/\s-O.\s/ /') $(JCPPFLAGS) $(JCXXFLAGS) $(SHIPFLAGS) $(CXX_DISABLE_ASSERTION) -c $< -o $@)
 $(BUILDDIR)/%.dbg.obj: $(SRCDIR)/%.cpp $(SRCDIR)/llvm-version.h $(HEADERS) $(LLVM_CONFIG_ABSOLUTE) | $(BUILDDIR)
        @$(call PRINT_CC, $(CXX) $(shell $(LLVM_CONFIG_HOST) --cxxflags) $(JCPPFLAGS) $(JCXXFLAGS) $(DEBUGFLAGS) -c $< -o $@)