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 24ec6db63e4a275dd03c07b1738d41bf47445b33..396f8b2817b66ba30fd0a912d20307d51843d0c7 100644 (file)
--- a/Make.inc
+++ b/Make.inc
@@ -502,7 +502,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 b6fe277543c4dbde5a6defe77808aa6508e785ac..88613ec44d7337757039adbfb052db06b60e2fa6 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 ac2dbb456c98d57af452a3f19d3faa22da541bf4..923a22a7a128b5e0166d1b38b66d782a9329739e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -96,7 +96,7 @@ endif
 PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
 
 LLVM_LDFLAGS := $(shell $(LLVM_CONFIG_HOST) --ldflags)
-LLVM_CXXFLAGS := $(shell $(LLVM_CONFIG_HOST) --cxxflags)
+LLVM_CXXFLAGS := $(shell $(LLVM_CONFIG_HOST) --cxxflags | sed 's/^/ /;s/$$/ /;s/\s-O.\s/ /')
 
 ifeq ($(JULIACODEGEN),LLVM)
 ifneq ($(USE_SYSTEM_LLVM),0)