Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From d4bf7a3853dab12c11cbfc8088fd76f548a8d017 Mon Sep 17 00:00:00 2001 |
| 2 | From: Patrik Hagglund <patrik.h.hagglund@ericsson.com> |
| 3 | Date: Tue, 24 Sep 2013 11:38:45 +0000 |
| 4 | Subject: [PATCH] Remove error output from configure if CFLAGS is set (r174313). |
| 5 | |
| 6 | This fixes PR16724. |
| 7 | |
| 8 | git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191289 91177308-0d34-0410-b5e6-96231b3b80d8 |
| 9 | |
| 10 | https://github.com/llvm-mirror/llvm/commit/d4bf7a3853dab12c11cbfc8088fd76f548a8d017 |
| 11 | |
| 12 | Upstream-Status: Backport |
| 13 | |
| 14 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
| 15 | --- |
| 16 | autoconf/configure.ac | 4 ++-- |
| 17 | configure | 4 ++-- |
| 18 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| 19 | |
| 20 | diff --git a/autoconf/configure.ac b/autoconf/configure.ac |
| 21 | index f9c365c..45f2fe4 100644 |
| 22 | --- a/autoconf/configure.ac |
| 23 | +++ b/autoconf/configure.ac |
| 24 | @@ -61,8 +61,8 @@ fi |
| 25 | |
| 26 | dnl Default to empty (i.e. assigning the null string to) CFLAGS and CXXFLAGS, |
| 27 | dnl instead of the autoconf default (for example, '-g -O2' for CC=gcc). |
| 28 | -${CFLAGS=} |
| 29 | -${CXXFLAGS=} |
| 30 | +: ${CFLAGS=} |
| 31 | +: ${CXXFLAGS=} |
| 32 | |
| 33 | dnl We need to check for the compiler up here to avoid anything else |
| 34 | dnl starting with a different one. |
| 35 | diff --git a/configure b/configure |
| 36 | index f3a6594..9090cda 100755 |
| 37 | --- a/configure |
| 38 | +++ b/configure |
| 39 | @@ -1992,8 +1992,8 @@ echo "$as_me: error: Already configured in ${srcdir}" >&2;} |
| 40 | fi |
| 41 | fi |
| 42 | |
| 43 | -${CFLAGS=} |
| 44 | -${CXXFLAGS=} |
| 45 | +: ${CFLAGS=} |
| 46 | +: ${CXXFLAGS=} |
| 47 | |
| 48 | ac_ext=c |
| 49 | ac_cpp='$CPP $CPPFLAGS' |
| 50 | -- |
| 51 | 1.9.1 |
| 52 | |