diff options
| author |   Chris Packham <judge.packham@gmail.com> | 2021-08-01 07:55:15 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-08-01 07:55:15 (GMT) |
| commit | d47b234152980a09196355b77a12cb425f3f1d2e (patch) | |
| tree | f5c20cf72381110830940cb6e2b73c558c1ce041 | |
| parent | cd275bc38c414fb1c3f0812f1d7e2d6648c2e0db (diff) | |
| parent | 91794500820c5b62e629e0bd3132815df42ca681 (diff) | |
Merge pull request #1568 from galak/fix-nano-spec
newlib-nano: Fix nano.spec based on CT_NEWLIB_NANO_INSTALL_IN_TARGET
| -rw-r--r-- | scripts/build/companion_libs/350-newlib_nano.sh | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/scripts/build/companion_libs/350-newlib_nano.sh b/scripts/build/companion_libs/350-newlib_nano.sh index 2d9de1b..f521be1 100644 --- a/scripts/build/companion_libs/350-newlib_nano.sh +++ b/scripts/build/companion_libs/350-newlib_nano.sh @@ -196,7 +196,33 @@ ENABLE_TARGET_OPTSPACE:target-optspace CT_DoLog EXTRA "Installing Newlib Nano C library" CT_DoExecLog ALL make install - cat > "${CT_SYSROOT_DIR}/lib/nano.specs" <<EOF + if [ "${CT_NEWLIB_NANO_INSTALL_IN_TARGET}" = "y" ]; then + cat > "${CT_SYSROOT_DIR}/lib/nano.specs" <<EOF +%rename link nano_link +%rename link_gcc_c_sequence nano_link_gcc_c_sequence +%rename cpp_unique_options nano_cpp_unique_options + +*cpp_unique_options: +-isystem =/include/newlib-nano %(nano_cpp_unique_options) + +*nano_libc: +-lc_nano + +*nano_libgloss: +%{specs=rdimon.specs:-lrdimon_nano} %{specs=nosys.specs:-lnosys} + +*link_gcc_c_sequence: +%(nano_link_gcc_c_sequence) --start-group %G %(nano_libc) %(nano_libgloss) --end-group + +*link: +%(nano_link) %:replace-outfile(-lc -lc_nano) %:replace-outfile(-lg -lg_nano) %:replace-outfile(-lm -lm_nano) %:replace-outfile(-lstdc++ -lstdc++_nano) %:replace-outfile(-lsupc++ -lsupc++_nano) %:replace-outfile(-lrdimon -lrdimon_nano) + +*lib: +%{!shared:%{g*:-lg_nano} %{!p:%{!pg:-lc_nano}}%{p:-lc_p}%{pg:-lc_p}} + +EOF + else + cat > "${CT_SYSROOT_DIR}/lib/nano.specs" <<EOF %rename link newlib_nano_link %rename cpp newlib_nano_cpp %rename cc1plus newlib_nano_cc1plus @@ -211,6 +237,7 @@ ENABLE_TARGET_OPTSPACE:target-optspace -L%:getenv(GCC_EXEC_PREFIX ../../newlib-nano/${CT_TARGET}/lib/%M) -L%:getenv(GCC_EXEC_PREFIX ../../newlib-nano/${CT_TARGET}/lib) EOF + fi # Create "nano" symlinks for libc.a, libg.a & libm.a CT_IterateMultilibs do_nano_libc_symlinks libc_symlinks |