From: Sébastien Villemot <sebastien@debian.org>
Date: Tue, 31 Dec 2019 08:30:40 +0000 (+0000)
Subject: Remove hardcoded GCC optimization flags
X-Git-Tag: archive/raspbian/1.4.1+dfsg-1+rpi1~2^2^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5baa8d754123e9e5c9622e4ba0f3a34101f34808;p=julia.git

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 2f0d52f..361e2e0 100644
--- 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 de246a5..6930481 100644
--- 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 ce846ca..04d1cd1 100644
--- 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 $@)