diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-24 11:01:06 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-04-24 11:01:08 +0200 |
| commit | 5a032138ff66eac08c7a51982efb9a6db59ddf68 (patch) | |
| tree | 0ca516338c173f0d19a5f1453a23e49e4277237b /patches | |
| parent | 647d9dcf1f8656f72601be6906200bc3e25ead8d (diff) | |
| download | ptxdist-5a032138ff66eac08c7a51982efb9a6db59ddf68.tar.gz ptxdist-5a032138ff66eac08c7a51982efb9a6db59ddf68.tar.xz | |
ncftp: improve clang hack
The check exists twice in configure, so fix it twice.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch b/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch index 97c9edfc3..7b4390302 100644 --- a/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch +++ b/patches/ncftp-3.2.6-src/0002-HACK-avoid-miss-detecting-clang.patch @@ -5,13 +5,15 @@ Subject: [PATCH] HACK: avoid miss detecting clang Without this gcc may be miss detected as clang if the build path contained the word 'clang'. +Note: configure is patched here because regenerating it is broken. + Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> --- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index b3095d8d3c34..fb2f9bc9901b 100755 +index b3095d8d3c34..0c0546dc2758 100755 --- a/configure +++ b/configure @@ -1820,7 +1820,7 @@ case "$CC" in @@ -23,3 +25,12 @@ index b3095d8d3c34..fb2f9bc9901b 100755 if test -n "$cc_dash_v" ; then CC_is_clang="yes" fi +@@ -2984,7 +2984,7 @@ case "$CC" in + CC_is_clang="yes" + ;; + *) +- cc_dash_v=`${CC-gcc} -v 2>&1 | grep clang 2>/dev/null` ++ cc_dash_v=`${CC-gcc} -v 2>&1 | grep '^clang' 2>/dev/null` + if test -n "$cc_dash_v" ; then + CC_is_clang="yes" + fi |