From: Thomas Schwinge <thomas@codesourcery.com>
To: Arthur Cohen <arthur.cohen@embecosm.com>,
Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>,
<gcc-rust@gcc.gnu.org>, <gcc-patches@gcc.gnu.org>
Cc: Iain Sandoe <iain@sandoe.co.uk>
Subject: libgrust: 'AM_ENABLE_MULTILIB' only for target builds [PR113056] (was: [PATCH v2 2/4] libgrust: Add libproc_macro and build system)
Date: Mon, 18 Dec 2023 17:58:58 +0100 [thread overview]
Message-ID: <87h6kfsazx.fsf@euler.schwinge.homeip.net> (raw)
In-Reply-To: <0B027199-B2BD-4CC0-9654-695A0316783A@sandoe.co.uk>
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
Hi!
> --- a/libgrust/configure.ac
> +++ b/libgrust/configure.ac
> -# AM_ENABLE_MULTILIB(, ..)
> +AM_ENABLE_MULTILIB(, ..)
Such a change was applied eventually, and is necessary for target builds
-- but potentially harmful for host builds. OK to push the attached
"libgrust: 'AM_ENABLE_MULTILIB' only for target builds [PR113056]"?
Grüße
Thomas
-----------------
Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-libgrust-AM_ENABLE_MULTILIB-only-for-target-builds-P.patch --]
[-- Type: text/x-diff, Size: 2387 bytes --]
From 71e00b191bd630aa3be66e38069c707ae76a91d3 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge <thomas@codesourcery.com>
Date: Mon, 18 Dec 2023 16:27:39 +0100
Subject: [PATCH] libgrust: 'AM_ENABLE_MULTILIB' only for target builds
[PR113056]
..., but not for host builds, which don't need it, and it may cause the build
to fail.
Use what appears to be the standard pattern for that (see
'libbacktrace/configure.ac', 'zlib/configure.ac').
PR rust/113056
libgrust/
* configure.ac: 'AM_ENABLE_MULTILIB' only for target builds.
* configure: Regenerate.
---
libgrust/configure | 8 +++++---
libgrust/configure.ac | 4 +++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/libgrust/configure b/libgrust/configure
index 5388a0e22a6..e778a253915 100755
--- a/libgrust/configure
+++ b/libgrust/configure
@@ -2387,7 +2387,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_files="$ac_config_files Makefile"
-# Default to --enable-multilib
+if test -n "${with_target_subdir}"; then
+ # Default to --enable-multilib
# Check whether --enable-multilib was given.
if test "${enable_multilib+set}" = set; then :
enableval=$enable_multilib; case "$enableval" in
@@ -2424,6 +2425,7 @@ fi
ac_config_commands="$ac_config_commands default-1"
+fi
# Do not delete or change the following two lines. For why, see
# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html
@@ -12653,7 +12655,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12656 "configure"
+#line 12658 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12759,7 +12761,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12762 "configure"
+#line 12764 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/libgrust/configure.ac b/libgrust/configure.ac
index 226c42ba649..adfb3500fb3 100644
--- a/libgrust/configure.ac
+++ b/libgrust/configure.ac
@@ -2,7 +2,9 @@ AC_INIT([libgrust], version-unused,,libgrust)
AC_CONFIG_SRCDIR(Makefile.am)
AC_CONFIG_FILES([Makefile])
-AM_ENABLE_MULTILIB(, ..)
+if test -n "${with_target_subdir}"; then
+ AM_ENABLE_MULTILIB(, ..)
+fi
# Do not delete or change the following two lines. For why, see
# http://gcc.gnu.org/ml/libstdc++/2003-07/msg00451.html
--
2.34.1
next prev parent reply other threads:[~2023-12-18 16:59 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 11:06 [PATCH v2 1/4] libgrust: Add entry for maintainers and stub changelog file Arthur Cohen
2023-10-25 11:06 ` [PATCH v2 2/4] libgrust: Add libproc_macro and build system Arthur Cohen
2023-10-26 8:21 ` Thomas Schwinge
2023-10-27 7:51 ` Iain Sandoe
2023-10-27 14:20 ` Thomas Schwinge
2023-10-27 20:32 ` Disable target libgrust if we're not building target libstdc++ (was: [PATCH v2 2/4] libgrust: Add libproc_macro and build system) Thomas Schwinge
2023-12-18 16:58 ` Thomas Schwinge [this message]
2024-01-04 15:43 ` libgrust: 'AM_ENABLE_MULTILIB' only for target builds [PR113056] Pierre-Emmanuel Patry
2023-12-15 9:53 ` [PATCH v2 2/4] libgrust: Add libproc_macro and build system Thomas Schwinge
2024-01-16 15:07 ` Jason Merrill
2023-10-25 11:06 ` [PATCH v2 3/4] build: Add libgrust as compilation modules Arthur Cohen
2023-10-25 11:09 ` [PATCH v2 4/4] build: Regenerate build files Arthur Cohen
2023-10-25 21:40 ` [PATCH v2 3/4] build: Add libgrust as compilation modules Thomas Schwinge
2023-10-26 12:07 ` Arthur Cohen
2023-10-27 10:24 ` Only build host libgrust if the Rust language is enabled (was: [PATCH v2 3/4] build: Add libgrust as compilation modules) Thomas Schwinge
2023-10-25 11:06 ` [PATCH v2 4/4] build: Regenerate build files Arthur Cohen
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=87h6kfsazx.fsf@euler.schwinge.homeip.net \
--to=thomas@codesourcery.com \
--cc=arthur.cohen@embecosm.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=gcc-rust@gcc.gnu.org \
--cc=iain@sandoe.co.uk \
--cc=pierre-emmanuel.patry@embecosm.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).