public inbox for
help / color / mirror / Atom feed
From: Michael Frysinger <>
Subject: [newlib-cygwin] libgloss: restore multilib settings in subdir makefiles
Date: Sat,  5 Feb 2022 00:38:12 +0000 (GMT)	[thread overview]
Message-ID: <> (raw);h=67c600b99545390c9ebaf96a84f47c3614e492ce

commit 67c600b99545390c9ebaf96a84f47c3614e492ce
Author: Mike Frysinger <>
Date:   Fri Feb 4 01:17:54 2022 -0500

    libgloss: restore multilib settings in subdir makefiles
    Commit 754f8def0dfeeb43afa5a96ad1971fd0ef02c419 ("libgloss: merge stub
    arch configure scripts up a level") had an unintended side-effect: the
    MULTI* variables in the Makefiles no longer get rewritten at configure
    time in the subdirs.  Only the top-level Makefile still is.  This is
    because the configure integration of multilib (both the way libgloss
    did it manually and the way AM_ENABLE_MULTILIB does it) only rewrites
    We could try propagating the MULTI* variables from libgloss/Makefile
    down via FLAGS_TO_PASS, but this runs into a limitation: the multilib
    logic uses this variable to switch from libgloss/ to each multilib
    libgloss/, and libgloss uses this variable to enter subdirectories.
    The latter we want, but the former ends up overridding the Makefile
    environment.  We could side-step that with some GNU Make directives,
    but it feels like we're getting a bit too deep down the rabbit hole.
    Instead, let's call ourselves for each subdir Makefile
    that the top-level configure generates.  This restores the previous
    behavior and should be less risky in general.
    This logic should be unnecessary when/if we switch libgloss over to
    a non-recursive Automake build (since all build+install settings are
    in the single libgloss/Makefile), but it'll be a while before we can
    land that rework, so let's fix this up now.

 libgloss/arm/configure    |  2 ++
 libgloss/arm/ |  4 +++-
 libgloss/configure        | 15 ++++++++++++++-
 libgloss/     | 13 +++++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/libgloss/arm/configure b/libgloss/arm/configure
index 8e3866b56..84878afff 100755
--- a/libgloss/arm/configure
+++ b/libgloss/arm/configure
@@ -3926,6 +3926,8 @@ $as_echo X"$file" |
+    "cpu-init/Makefile":F)     ac_file=cpu-init/Makefile . ${srcdir}/../../
+   ;;
 # Only add multilib support code if we just rebuilt the top-level
 # Makefile.
diff --git a/libgloss/arm/ b/libgloss/arm/
index 2b98b5453..3d7ba7da1 100644
--- a/libgloss/arm/
+++ b/libgloss/arm/
@@ -62,7 +62,9 @@ AC_SUBST_FILE(host_makefile_frag)
 # Configure cpu init plug-ins
 if test -d "${srcdir}/cpu-init"; then
   subdirs="${subdirs} cpu-init"
-  AC_CONFIG_FILES([cpu-init/Makefile])
+  AC_CONFIG_FILES([cpu-init/Makefile], [dnl
+    ac_file=cpu-init/Makefile . ${srcdir}/../../
+  ])
diff --git a/libgloss/configure b/libgloss/configure
index 3fc20d6a2..64f08cf16 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -4794,6 +4794,9 @@ target_makefile_frag_path=$target_makefile_frag
+ac_config_commands="$ac_config_commands default-1"
 # Default to --enable-multilib
 # Check whether --enable-multilib was given.
 if test "${enable_multilib+set}" = set; then :
@@ -4829,7 +4832,7 @@ if test $cross_compiling = no && test $multilib = yes \
-ac_config_commands="$ac_config_commands default-1"
+ac_config_commands="$ac_config_commands default-2"
 ac_config_files="$ac_config_files Makefile"
@@ -5554,6 +5557,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
@@ -5618,6 +5622,7 @@ do
     "libnosys/Makefile") CONFIG_FILES="$CONFIG_FILES libnosys/Makefile" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -6347,6 +6352,14 @@ $as_echo X"$file" |
+for subdir in $subdirs; do
+  case " $CONFIG_FILES " in
+   *" $subdir/Makefile "*)
+     ac_file=$subdir/Makefile . ${multi_basedir}/
+     ;;
+  esac
+done ;;
+    "default-2":C)
 # Only add multilib support code if we just rebuilt the top-level
 # Makefile.
 case " $CONFIG_FILES " in
diff --git a/libgloss/ b/libgloss/
index ac812c69b..1fa877729 100644
--- a/libgloss/
+++ b/libgloss/
@@ -330,6 +330,19 @@ target_makefile_frag_path=$target_makefile_frag
+dnl AM_ENABLE_MULTILIB only processes the top-level Makefile, but we want the
+dnl multilib settings to propagate to all sub-Makefiles that we recurse into
+dnl too.  This can go away if we ever get rid of sub-Makefiles and only use
+dnl Automake + makefile include fragments.
+for subdir in $subdirs; do
+  case " $CONFIG_FILES " in
+   *" $subdir/Makefile "*)
+     ac_file=$subdir/Makefile . ${multi_basedir}/
+     ;;
+  esac
+done], [subdirs="$subdirs"])

                 reply	other threads:[~2022-02-05  0: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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \

* 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).