summaryrefslogtreecommitdiff
path: root/util/crossgcc
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-08-31 23:11:18 +0200
committerMartin Roth <martinroth@google.com>2017-09-02 15:30:52 +0000
commit3f12d9321ac9d7ea6a4609aec697760c658af6f9 (patch)
tree2612e282ecbc3149f5ba57d42bf37723368dfb65 /util/crossgcc
parentd9ccb4e5f8309a57a7ab0b4c927b8cfce348dbe1 (diff)
buildgcc: Fix up cross GCC building
Add a missing line-break escape and, rather cosmetic, guard execution of $CXX which we allow but don't force to be set. Change-Id: Icf6d3b7de4b7999b8214489f28997964c490d1e9 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/21307 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'util/crossgcc')
-rwxr-xr-xutil/crossgcc/buildgcc4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 9cbdfc6001..0834929f8d 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -659,7 +659,7 @@ build_cross_GCC() {
# Work around crazy code generator in GCC that confuses CLANG.
$CC --version | grep clang >/dev/null 2>&1 && \
CLANGFLAGS="-fbracket-depth=1024"
- $CXX --version | grep clang >/dev/null 2>&1 && \
+ [ -n "$CXX" ] && $CXX --version | grep clang >/dev/null 2>&1 && \
CLANGCXXFLAGS="-fbracket-depth=1024"
# GCC does not honor HOSTCFLAGS at all. CFLAGS are used for
@@ -670,7 +670,7 @@ build_cross_GCC() {
# Also set the CXX version of the flags because GCC is now compiled
# using C++.
CC="$(hostcc target)" CXX="$(hostcxx target)" \
- CFLAGS_FOR_TARGET="-O2 -Dinhibit_libc"
+ CFLAGS_FOR_TARGET="-O2 -Dinhibit_libc" \
CFLAGS="$HOSTCFLAGS $CLANGFLAGS" \
CFLAGS_FOR_BUILD="$HOSTCFLAGS $CLANGFLAGS" \
CXXFLAGS="$HOSTCFLAGS $CLANGCXXFLAGS" \