diff options
| author |   Alexey Neyman <stilor@att.net> | 2022-02-08 23:52:48 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2022-02-11 08:47:51 (GMT) |
| commit | 93be629f2b255e348d0139558c5cd346a13787d2 (patch) | |
| tree | 22b460c1072fe001fe4b18e7cdb4a5fad5e803e6 /scripts/build/libc/newlib.sh | |
| parent | c320d220d65066688c80fffa7b85208e2bc06afc (diff) | |
Fold libc_start_files into libc
After 557b9d4, libc_start_files and libc_main steps are performed one
after another. It doesn't make sense, especially since some of the libcs
(glibc, uClibc-ng) go to great lengths to first install start files in
the first step, libc_start_files, only to remove them immediately in the
second step, libc_main.
Current build steps also break in the xtensa newlib configurations, as
it needs to install the custom xtensa headers before building the libgcc
and after 557b9d4, the headers are not installed before libgcc is built
in pass-1.
Therefore, finish what 557b9d4 mentioned but did not do: move header
installation into a new step, libc_headers, and combine libc_start_files
and libc_main into a single step.
This also allows to combine the core pass-1/pass-2 steps, to be done in
a subsequent commit.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/libc/newlib.sh')
| -rw-r--r-- | scripts/build/libc/newlib.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index ddecdb1..72111a9 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -5,11 +5,10 @@ # Edited by Martin Lund <mgl@doredevelopment.dk> # -newlib_start_files() +newlib_headers() { - CT_DoStep INFO "Installing C library headers & start files" - CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." \ - "${CT_HEADERS_DIR}" + CT_DoStep INFO "Installing C library headers" + CT_DoExecLog ALL cp -a "${CT_SRC_DIR}/newlib/newlib/libc/include/." "${CT_HEADERS_DIR}" if [ "${CT_ARCH_XTENSA}" = "y" ]; then CT_DoLog EXTRA "Installing Xtensa headers" CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/newlib/newlib/libc/sys/xtensa/include/." \ |