mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-19 04:49:25 +08:00
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:
parent
ec69debcb9
commit
5a6bf1749f
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
4
newlib/libc/sys/phoenix/configure
vendored
4
newlib/libc/sys/phoenix/configure
vendored
@ -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
|
||||
|
@ -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
|
||||
|
@ -2,6 +2,8 @@
|
||||
|
||||
SUBDIRS = $(machine_dir) .
|
||||
|
||||
CRT0 = crt0.o
|
||||
|
||||
noinst_DATA = $(CRT0) lib.a
|
||||
|
||||
$(CRT0): $(machine_dir)/$(CRT0)
|
||||
|
@ -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
|
||||
|
7
newlib/libc/sys/phoenix/machine/configure
vendored
7
newlib/libc/sys/phoenix/machine/configure
vendored
@ -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='#'
|
||||
|
@ -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])
|
||||
|
Loading…
x
Reference in New Issue
Block a user