From e07acc8b86d57476fb4522c13eff8dd456cc6083 Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Wed, 1 Oct 2014 16:14:39 +0200
Subject: [PATCH] Don't fail twice.
---
src/Makefile.in | 34 ++++--------------
src/configure.in | 6 ----
src/modules/common_module_makefile.in | 51 +++++----------------------
3 files changed, 15 insertions(+), 76 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index e5dc6788ee..dd22694000 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -485,20 +485,9 @@ undump_modules: delete_dumped_modules
rm -f $@.fail >/dev/null 2>&1; \
if $(CC) $(CFLAGS) $$EXTRAFLAGS -c $< -o $@ ; then : ; else \
status=$$?; \
- if test x"@noopt_retry@" = xyes ; then \
- echo "WARNING: Compiler failure! Trying without optimization!" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) $$EXTRAFLAGS -c $< -o $@" >$@.fail ;\
- if NO_ULIMIT=yes $(CC) $(PREFLAGS) $(NOOPTFLAGS) $$EXTRAFLAGS -c $< -o $@ ; then : ; else \
- status=$$?; \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(NOOPTFLAGS) $$EXTRAFLAGS -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
- else \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) $$EXTRAFLAGS -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
+ echo "Compilation command was:" >&2;\
+ echo "$(CC) $(PREFLAGS) $(CFLAGS) $$EXTRAFLAGS -c $< -o $@" >&2 ;\
+ exit $$status; \
fi
.m.o:
@@ -506,20 +495,9 @@ undump_modules: delete_dumped_modules
rm -f $@.fail >/dev/null 2>&1; \
if $(CC) $(CFLAGS) $$EXTRAFLAGS -fobjc-exceptions -fobjc-gc -c $< -o $@ ; then : ; else \
status=$$?; \
- if test x"@noopt_retry@" = xyes ; then \
- echo "WARNING: Compiler failure! Trying without optimization!" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) $$EXTRAFLAGS -fobjc-exceptions -c $< -o $@" >$@.fail ;\
- if NO_ULIMIT=yes $(CC) $(PREFLAGS) $(NOOPTFLAGS) $$EXTRAFLAGS -c $< -o $@ ; then : ; else \
- status=$$?; \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(NOOPTFLAGS) $$EXTRAFLAGS -fobjc-exceptions -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
- else \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) $$EXTRAFLAGS -fobjc-exceptions -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
+ echo "Compilation command was:" >&2;\
+ echo "$(CC) $(PREFLAGS) $(CFLAGS) $$EXTRAFLAGS -fobjc-exceptions -c $< -o $@" >&2 ;\
+ exit $$status; \
fi
#
diff --git a/src/configure.in b/src/configure.in
index cb9c5fa8bd..73a07f93c8 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -213,10 +213,6 @@ It is probably best to delete ./config.cache before proceeding.])
fi
-AC_ARG_ENABLE(noopt-retry, MY_DESCR([--disable-noopty-retry],
- [do not retry compilation without optimizations if it fails]),
- [], [noopt_retry=yes])
-
# Do the below even when --disable-binary is used, since we need a
# real $CPP, and AC_PROG_CPP wants AC_PROG_CC to be called earlier.
# $CC will be overridden with a dummy later on.
@@ -8288,7 +8284,6 @@ echo
export LDFLAGS CFLAGS CPPFLAGS LIBS
export prefix exec_prefix OTHERFLAGS
export DEFINES INSTALL
-export noopt_retry
PIKE_SRC_DIR=$srcdir
export PIKE_SRC_DIR
@@ -8312,7 +8307,6 @@ AC_SUBST(RANLIB)
AC_SUBST(DEBUGDEF)
AC_SUBST(EXTRA_MODULE_REQUIREMENTS)
AC_SUBST(DTRACE_REQUIREMENTS)
-AC_SUBST(noopt_retry)
pike_cv_prog_CC="${CC}"
diff --git a/src/modules/common_module_makefile.in b/src/modules/common_module_makefile.in
index 359684360f..41fd946e10 100644
--- a/src/modules/common_module_makefile.in
+++ b/src/modules/common_module_makefile.in
@@ -58,20 +58,9 @@ $(MODULE_ARCHIVES) ThisIsAPhonyTargetBlaBlaBla: force
rm -f $@.fail >/dev/null 2>&1; \
if $(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@ ; then : ; else \
status=$$?; \
- if test x"@noopt_retry@" = xyes ; then \
- echo "WARNING: Compiler failure! Trying without optimization!" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >$@.fail ;\
- if NO_ULIMIT=yes $(CC) $(PREFLAGS) $(NOOPT_CFLAGS) -c $< -o $@ ; then : ; else \
- status=$$?; \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(NOOPT_CFLAGS) -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
- else \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
+ echo "Compilation command was:" >&2;\
+ echo "$(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >&2 ;\
+ exit $$status; \
fi
.c.protos: $(BUILD_BASE)/precompile.sh-stamp
@@ -84,20 +73,9 @@ $(MODULE_ARCHIVES) ThisIsAPhonyTargetBlaBlaBla: force
rm -f $@.fail >/dev/null 2>&1; \
if $(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@ ; then : ; else \
status=$$?; \
- if test x"@noopt_retry@" = xyes ; then \
- echo "WARNING: Compiler failure! Trying without optimization!" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >$@.fail ;\
- if NO_ULIMIT=yes $(CC) $(PREFLAGS) $(NOOPT_CFLAGS) -c $< -o $@ ; then : ; else \
- status=$$?; \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(NOOPT_CFLAGS) -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
- else \
- echo "Compilation command was:" >&2;\
- echo "$(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
+ echo "Compilation command was:" >&2;\
+ echo "$(CC) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >&2 ;\
+ exit $$status; \
fi
.m.protos: $(BUILD_BASE)/precompile.sh-stamp
@@ -111,20 +89,9 @@ $(MODULE_ARCHIVES) ThisIsAPhonyTargetBlaBlaBla: force
rm -f $@.fail >/dev/null 2>&1; \
if $(CXX) $(PREFLAGS) $(CFLAGS) -c $< -o $@ ; then : ; else \
status=$$?; \
- if test x"@noopt_retry@" = xyes ; then \
- echo "WARNING: Compiler failure! Trying without optimization!" >&2;\
- echo "$(CXX) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >$@.fail ;\
- if NO_ULIMIT=yes $(CXX) $(PREFLAGS) $(NOOPT_CFLAGS) -c $< -o $@ ; then : ; else \
- status=$$?; \
- echo "Compilation command was:" >&2;\
- echo "$(CXX) $(PREFLAGS) $(NOOPT_CFLAGS) -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
- else \
- echo "Compilation command was:" >&2;\
- echo "$(CXX) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >&2 ;\
- exit $$status; \
- fi; \
+ echo "Compilation command was:" >&2;\
+ echo "$(CXX) $(PREFLAGS) $(CFLAGS) -c $< -o $@" >&2 ;\
+ exit $$status; \
fi
.cc.protos: $(BUILD_BASE)/precompile.sh-stamp
--
GitLab