From f67005db0abbe5793c00c5f8b968e84a52c28ab1 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 28 Jan 2024 01:20:43 +0100 Subject: [PATCH] crossgcc: Distinguish bootstrap and target compiler options GCC_OPTIONS is only used for target specific options right now, so rename to TARGET_GCC_OPTIONS and only use them in the non-bootstrap build. Adapt BINUTILS_OPTIONS for consistency, even though it doesn't have the same problem. Change-Id: I5e4f54b758dd7daf4e69101c19dfa1212fa64cf6 Signed-off-by: Patrick Georgi Reviewed-on: https://review.coreboot.org/c/coreboot/+/80229 Reviewed-by: Martin L Roth Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer --- util/crossgcc/buildgcc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 23a5caf2bb..b294da5dfb 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -722,7 +722,7 @@ build_BINUTILS() { --enable-multilib \ --disable-docs \ --disable-texinfo \ - ${BINUTILS_OPTIONS} \ + ${TARGET_BINUTILS_OPTIONS} \ CFLAGS="$HOSTCFLAGS" \ CXXFLAGS="$HOSTCFLAGS" || touch .failed # shellcheck disable=SC2086 @@ -811,6 +811,7 @@ build_cross_GCC() { --disable-libcc1 \ --disable-decimal-float \ ${GCC_OPTIONS} \ + ${TARGET_GCC_OPTIONS} \ --enable-languages="${LANGUAGES}" \ --with-system-zlib \ --with-gmp="$DESTDIR$TARGETDIR" \ @@ -995,8 +996,8 @@ case "$TARGETARCH" in i386-elf) ;; i386-mingw32) ;; riscv-elf) TARGETARCH=riscv64-elf - GCC_OPTIONS="$GCC_OPTIONS --with-isa-spec=20191213" - BINUTILS_OPTIONS="$BINUTILS_OPTIONS --with-isa-spec=20191213";; + TARGET_GCC_OPTIONS="$TARGET_GCC_OPTIONS --with-isa-spec=20191213" + TARGET_BINUTILS_OPTIONS="$TARGET_BINUTILS_OPTIONS --with-isa-spec=20191213";; powerpc64*-linux*) ;; i386*) TARGETARCH=i386-elf;; arm*) TARGETARCH=arm-eabi;;