Branch: Tag:

2014-10-01

2014-10-01 14:14:51 by Martin Nilsson <nilsson@opera.com>

Don't fail twice.

485:    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; \ +     fi      .m.o:
506:    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; \ +     fi      #