drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Mike Frysinger 2022-02-10 01:38:17 -05:00
parent ec69debcb9
commit 5a6bf1749f
8 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
newlib/libc/sys/phoenix/Makefile.am
View File

@ -4,6 +4,8 @@ AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLA
SUBDIRS = machine SUBDIRS = machine
PHOENIX_MACH_LIB = machine/lib.a
SUBLIBS = \ SUBLIBS = \
$(PHOENIX_MACH_LIB) $(PHOENIX_MACH_LIB)

2
newlib/libc/sys/phoenix/Makefile.in
View File

@ -271,7 +271,6 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEPARATOR = @PATH_SEPARATOR@
PHOENIX_MACH_LIB = @PHOENIX_MACH_LIB@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
READELF = @READELF@ READELF = @READELF@
SET_MAKE = @SET_MAKE@ SET_MAKE = @SET_MAKE@
@ -337,6 +336,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL) AM_CPPFLAGS = -I$(srcdir)/include $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) $(INCLTDL)
SUBDIRS = machine SUBDIRS = machine
PHOENIX_MACH_LIB = machine/lib.a
SUBLIBS = \ SUBLIBS = \
$(PHOENIX_MACH_LIB) $(PHOENIX_MACH_LIB)

4
newlib/libc/sys/phoenix/configure vendored
View File

@ -588,7 +588,6 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE am__EXEEXT_TRUE
LTLIBOBJS LTLIBOBJS
LIBOBJS LIBOBJS
PHOENIX_MACH_LIB
subdirs subdirs
sys_dir sys_dir
shared_machine_dir shared_machine_dir
@ -4265,9 +4264,6 @@ OBJEXT=o
subdirs="$subdirs machine" subdirs="$subdirs machine"
PHOENIX_MACH_LIB=machine/lib.a
ac_config_files="$ac_config_files Makefile" ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF

3
newlib/libc/sys/phoenix/configure.ac
View File

@ -11,8 +11,5 @@ NEWLIB_CONFIGURE(../../..)
AC_CONFIG_SUBDIRS(machine) AC_CONFIG_SUBDIRS(machine)
PHOENIX_MACH_LIB=machine/lib.a
AC_SUBST(PHOENIX_MACH_LIB)
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

2
newlib/libc/sys/phoenix/machine/Makefile.am
View File

@ -2,6 +2,8 @@
SUBDIRS = $(machine_dir) . SUBDIRS = $(machine_dir) .
CRT0 = crt0.o
noinst_DATA = $(CRT0) lib.a noinst_DATA = $(CRT0) lib.a
$(CRT0): $(machine_dir)/$(CRT0) $(CRT0): $(machine_dir)/$(CRT0)

2
newlib/libc/sys/phoenix/machine/Makefile.in
View File

@ -175,7 +175,6 @@ CCASFLAGS = @CCASFLAGS@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CPP = @CPP@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
CRT0 = @CRT0@
CYGPATH_W = @CYGPATH_W@ CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@ DEFS = @DEFS@
ECHO_C = @ECHO_C@ ECHO_C = @ECHO_C@
@ -269,6 +268,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
SUBDIRS = $(machine_dir) . SUBDIRS = $(machine_dir) .
CRT0 = crt0.o
noinst_DATA = $(CRT0) lib.a noinst_DATA = $(CRT0) lib.a
CLEANFILES = $(CRT0) CLEANFILES = $(CRT0)
ACLOCAL_AMFLAGS = -I ../../../.. -I ../../../../.. -I ../../../../../config ACLOCAL_AMFLAGS = -I ../../../.. -I ../../../../.. -I ../../../../../config

7
newlib/libc/sys/phoenix/machine/configure vendored
View File

@ -590,7 +590,6 @@ LTLIBOBJS
LIBOBJS LIBOBJS
HAVE_MACHINE_DIR_FALSE HAVE_MACHINE_DIR_FALSE
HAVE_MACHINE_DIR_TRUE HAVE_MACHINE_DIR_TRUE
CRT0
subdirs subdirs
sys_dir sys_dir
shared_machine_dir shared_machine_dir
@ -4280,12 +4279,6 @@ subdirs="$subdirs arm"
esac; esac;
fi fi
CRT0=
if test -n "${machine_dir}"; then
CRT0=crt0.o
fi
if test x${machine_dir} != x; then if test x${machine_dir} != x; then
HAVE_MACHINE_DIR_TRUE= HAVE_MACHINE_DIR_TRUE=
HAVE_MACHINE_DIR_FALSE='#' HAVE_MACHINE_DIR_FALSE='#'

6
newlib/libc/sys/phoenix/machine/configure.ac
View File

@ -18,12 +18,6 @@ if test -n "${machine_dir}"; then
esac; esac;
fi 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) AM_CONDITIONAL(HAVE_MACHINE_DIR, test x${machine_dir} != x)
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])