From 7a4bef590b37683b08ebaee384d0694b9afccc57 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 28 Jan 2022 07:24:18 -0500 Subject: [PATCH] newlib: hoist crt0 install up another dir Commit dd23de27c8e45513ad276f503a0036c3bc4e487b ("newlib: libc: install CRT0 straight out of subdir") got rid of the libc/sys/ intermediate for copying the file up, but the top-level newlib/ dir was still expecting a libc/crt0.o to exist so it could install. Update that to also look for the crt0 file directly under libc/ like we already do for crt1. --- newlib/configure | 2 +- newlib/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/newlib/configure b/newlib/configure index 9bbb089a9..31b790f2a 100755 --- a/newlib/configure +++ b/newlib/configure @@ -12442,7 +12442,7 @@ CRT0= CRT0_DIR= if test "x${have_crt0}" = "xyes"; then CRT0=crt0.o - CRT0_DIR=libc/ + CRT0_DIR=libc/sys/${sys_dir}/ fi if test x$have_crt0 = xyes; then HAVE_CRT0_TRUE= diff --git a/newlib/configure.ac b/newlib/configure.ac index 13f318922..cac2d7296 100644 --- a/newlib/configure.ac +++ b/newlib/configure.ac @@ -361,7 +361,7 @@ CRT0= CRT0_DIR= if test "x${have_crt0}" = "xyes"; then CRT0=crt0.o - CRT0_DIR=libc/ + CRT0_DIR=libc/sys/${sys_dir}/ fi AM_CONDITIONAL(HAVE_CRT0, test x$have_crt0 = xyes) AC_SUBST(CRT0) -- 2.43.5