From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Subject: [PATCH 1/5] newlib: phoenix: move some logic from configure to the Makefile
Date: Thu, 10 Feb 2022 03:51:22 -0500 [thread overview]
Message-ID: <20220210085126.21023-2-vapier@gentoo.org> (raw)
In-Reply-To: <20220210085126.21023-1-vapier@gentoo.org>
These configure scripts hardcode some settings, so move them to the
Makefile to simplify so we can drop the configure scripts entirely.
---
newlib/libc/sys/phoenix/Makefile.am | 2 ++
newlib/libc/sys/phoenix/Makefile.in | 2 +-
newlib/libc/sys/phoenix/configure | 4 ----
newlib/libc/sys/phoenix/configure.ac | 3 ---
newlib/libc/sys/phoenix/machine/Makefile.am | 2 ++
newlib/libc/sys/phoenix/machine/Makefile.in | 2 +-
newlib/libc/sys/phoenix/machine/configure | 7 -------
newlib/libc/sys/phoenix/machine/configure.ac | 6 ------
8 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/newlib/libc/sys/phoenix/Makefile.am b/newlib/libc/sys/phoenix/Makefile.am
index 49647c207544..d6c32e734e5b 100644
--- a/newlib/libc/sys/phoenix/Makefile.am
+++ b/newlib/libc/sys/phoenix/Makefile.am
@@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLA
SUBDIRS = machine
+PHOENIX_MACH_LIB = machine/lib.a
+
SUBLIBS = \
$(PHOENIX_MACH_LIB)
diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac
index 55793f7a98c0..9d64b9d258a2 100644
--- a/newlib/libc/sys/phoenix/configure.ac
+++ b/newlib/libc/sys/phoenix/configure.ac
@@ -11,8 +11,5 @@ NEWLIB_CONFIGURE(../../..)
AC_CONFIG_SUBDIRS(machine)
-PHOENIX_MACH_LIB=machine/lib.a
-AC_SUBST(PHOENIX_MACH_LIB)
-
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/newlib/libc/sys/phoenix/machine/Makefile.am b/newlib/libc/sys/phoenix/machine/Makefile.am
index 06c2509a2aab..793d011bef30 100644
--- a/newlib/libc/sys/phoenix/machine/Makefile.am
+++ b/newlib/libc/sys/phoenix/machine/Makefile.am
@@ -2,6 +2,8 @@
SUBDIRS = $(machine_dir) .
+CRT0 = crt0.o
+
noinst_DATA = $(CRT0) lib.a
$(CRT0): $(machine_dir)/$(CRT0)
diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac
index f3f7c79bc1f5..05dd0f8e48b6 100644
--- a/newlib/libc/sys/phoenix/machine/configure.ac
+++ b/newlib/libc/sys/phoenix/machine/configure.ac
@@ -18,12 +18,6 @@ if test -n "${machine_dir}"; then
esac;
fi
-CRT0=
-if test -n "${machine_dir}"; then
- CRT0=crt0.o
-fi
-AC_SUBST(CRT0)
-
AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
AC_CONFIG_FILES([Makefile])
--
2.34.1
next prev parent reply other threads:[~2022-02-10 8:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-10 8:51 [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Mike Frysinger
2022-02-10 8:51 ` Mike Frysinger [this message]
2022-02-10 8:51 ` [PATCH 2/5] newlib: phoenix: drop missing machine subdirs Mike Frysinger
2022-02-10 8:51 ` [PATCH 3/5] newlib: phoenix: merge machine/ trampoline up a level Mike Frysinger
2022-02-10 8:51 ` [PATCH 4/5] newlib: phoenix: merge machine/ configure scripts " Mike Frysinger
2022-02-10 8:51 ` [PATCH 5/5] newlib: phoenix: merge configure up to top-level Mike Frysinger
2022-02-15 13:38 ` [PATCH 0/5] newlib: phoenix: kill off all subdir configure scripts Corinna Vinschen
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=20220210085126.21023-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=newlib@sourceware.org \
/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).