From: Thomas Petazzoni via buildroot <buildroot@buildroot.org>
To: buildroot@buildroot.org
Subject: [Buildroot] [git commit] package/gcc: refactor nios2 obsolete handling into common gcc code
Date: Mon, 13 May 2024 22:37:38 +0200 [thread overview]
Message-ID: <20240513203849.1A0748715D@busybox.osuosl.org> (raw)
commit: https://git.buildroot.net/buildroot/commit/?id=1c8bdef54213640e88b199466d1e504515c1a073
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Commit 69cb6259479c548a09aac1140261c17f1cbb86b3 ("package/gcc: enable
obsolete nios2 target") added some handling of nios2 with gcc 14.x,
duplicated between gcc-initial and gcc-final. Let's deduplicate this
logic into the common package/gcc/gcc.mk code.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/gcc/gcc-final/gcc-final.mk | 5 -----
package/gcc/gcc-initial/gcc-initial.mk | 5 -----
package/gcc/gcc.mk | 5 +++++
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk
index 5feb96b568..99d7047b5f 100644
--- a/package/gcc/gcc-final/gcc-final.mk
+++ b/package/gcc/gcc-final/gcc-final.mk
@@ -117,11 +117,6 @@ else
HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp
endif
-# allow to build gcc 14.x
-ifeq ($(BR2_nios2),y)
-HOST_GCC_FINAL_CONF_OPTS += --enable-obsolete
-endif
-
# End with user-provided options, so that they can override previously
# defined options.
HOST_GCC_FINAL_CONF_OPTS += \
diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk
index 8b4247bdad..1f8b76a942 100644
--- a/package/gcc/gcc-initial/gcc-initial.mk
+++ b/package/gcc/gcc-initial/gcc-initial.mk
@@ -42,11 +42,6 @@ HOST_GCC_INITIAL_CONF_OPTS = \
--disable-largefile \
$(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS))
-# allow to build gcc 14.x
-ifeq ($(BR2_nios2),y)
-HOST_GCC_INITIAL_CONF_OPTS += --enable-obsolete
-endif
-
HOST_GCC_INITIAL_CONF_ENV = \
$(HOST_GCC_COMMON_CONF_ENV)
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 94935d79a2..672f9472a9 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -293,6 +293,11 @@ HOST_GCC_COMMON_CONF_OPTS += \
--with-long-double-128
endif
+# allow to build gcc 14.x
+ifeq ($(BR2_nios2),y)
+HOST_GCC_COMMON_CONF_OPTS += --enable-obsolete
+endif
+
HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"'
# For gcc-initial, we need to tell gcc that the C library will be
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
reply other threads:[~2024-05-13 20:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240513203849.1A0748715D@busybox.osuosl.org \
--to=buildroot@buildroot.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).