public inbox for newlib-cvs@sourceware.org help / color / mirror / Atom feed
From: Michael Frysinger <vapier@sourceware.org> To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: phoenix: move some logic from configure to the Makefile Date: Wed, 16 Feb 2022 00:59:23 +0000 (GMT) [thread overview] Message-ID: <20220216005923.2C93D3858C1F@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=5a6bf1749faeadc42f29e4f4be8defc957e84484 commit 5a6bf1749faeadc42f29e4f4be8defc957e84484 Author: Mike Frysinger <vapier@gentoo.org> Date: Thu Feb 10 01:38:17 2022 -0500 newlib: phoenix: move some logic from configure to the Makefile These configure scripts hardcode some settings, so move them to the Makefile to simplify so we can drop the configure scripts entirely. Diff: --- 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 49647c207..d6c32e734 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/Makefile.in b/newlib/libc/sys/phoenix/Makefile.in index ba33e6b36..c7a043fc2 100644 --- a/newlib/libc/sys/phoenix/Makefile.in +++ b/newlib/libc/sys/phoenix/Makefile.in @@ -271,7 +271,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PHOENIX_MACH_LIB = @PHOENIX_MACH_LIB@ RANLIB = @RANLIB@ READELF = @READELF@ SET_MAKE = @SET_MAKE@ @@ -337,6 +336,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL) SUBDIRS = machine +PHOENIX_MACH_LIB = machine/lib.a SUBLIBS = \ $(PHOENIX_MACH_LIB) diff --git a/newlib/libc/sys/phoenix/configure b/newlib/libc/sys/phoenix/configure index 0231cdb45..f24ef05cd 100644 --- a/newlib/libc/sys/phoenix/configure +++ b/newlib/libc/sys/phoenix/configure @@ -588,7 +588,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -PHOENIX_MACH_LIB subdirs sys_dir shared_machine_dir @@ -4265,9 +4264,6 @@ OBJEXT=o subdirs="$subdirs machine" -PHOENIX_MACH_LIB=machine/lib.a - - ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF diff --git a/newlib/libc/sys/phoenix/configure.ac b/newlib/libc/sys/phoenix/configure.ac index 55793f7a9..9d64b9d25 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 06c2509a2..793d011be 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/Makefile.in b/newlib/libc/sys/phoenix/machine/Makefile.in index bc00576e8..ecebd8b2f 100644 --- a/newlib/libc/sys/phoenix/machine/Makefile.in +++ b/newlib/libc/sys/phoenix/machine/Makefile.in @@ -175,7 +175,6 @@ CCASFLAGS = @CCASFLAGS@ CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ -CRT0 = @CRT0@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ ECHO_C = @ECHO_C@ @@ -269,6 +268,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = $(machine_dir) . +CRT0 = crt0.o noinst_DATA = $(CRT0) lib.a CLEANFILES = $(CRT0) ACLOCAL_AMFLAGS = -I ../../../.. -I ../../../../.. -I ../../../../../config diff --git a/newlib/libc/sys/phoenix/machine/configure b/newlib/libc/sys/phoenix/machine/configure index d516e11ef..8d7fde54d 100644 --- a/newlib/libc/sys/phoenix/machine/configure +++ b/newlib/libc/sys/phoenix/machine/configure @@ -590,7 +590,6 @@ LTLIBOBJS LIBOBJS HAVE_MACHINE_DIR_FALSE HAVE_MACHINE_DIR_TRUE -CRT0 subdirs sys_dir shared_machine_dir @@ -4280,12 +4279,6 @@ subdirs="$subdirs arm" esac; fi -CRT0= -if test -n "${machine_dir}"; then - CRT0=crt0.o -fi - - if test x${machine_dir} != x; then HAVE_MACHINE_DIR_TRUE= HAVE_MACHINE_DIR_FALSE='#' diff --git a/newlib/libc/sys/phoenix/machine/configure.ac b/newlib/libc/sys/phoenix/machine/configure.ac index f3f7c79bc..05dd0f8e4 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])
reply other threads:[~2022-02-16 0:59 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=20220216005923.2C93D3858C1F@sourceware.org \ --to=vapier@sourceware.org \ --cc=newlib-cvs@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: linkBe 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).