mirror of
https://github.com/apache/nuttx.git
synced 2026-08-30 05:40:37 +00:00
87260499e1
Some checks are pending
MemBrowse Memory Report / changes-filter (push) Waiting to run
MemBrowse Memory Report / load-targets (push) Waiting to run
MemBrowse Memory Report / identical (push) Blocked by required conditions
MemBrowse Memory Report / analyze (push) Blocked by required conditions
This change fixes NuttX’s CMake support when NuttX is embedded in another project via add_subdirectory(). CMake’s CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR refer to the outermost project, causing NuttX to access its .config, generated files, host tools, and build artifacts in the parent project’s directories. The fix introduces NUTTX_DIR and NUTTX_BINARY_DIR, based on CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR, and consistently uses them for NuttX self-references while preserving existing standalone builds. It fixes the Kconfig initialization failure reported in #19697 and allows an embedded sim:nsh build to configure, build, and boot successfully. The change affects only the CMake build system (not Make or Kconfig defaults), requires the corresponding nuttx-apps change, and does not extend add_subdirectory() support to cross-compiled non-sim boards due to CMake’s toolchain-file limitation. Fixes #19697. Assisted-by: Claude:claude-sonnet-5 Signed-off-by: Alan Carvalho de Assis <acassis@gmail.com>
61 lines
1.8 KiB
CMake
61 lines
1.8 KiB
CMake
# ##############################################################################
|
|
# libs/libc/elf/CMakeLists.txt
|
|
#
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
|
|
# license agreements. See the NOTICE file distributed with this work for
|
|
# additional information regarding copyright ownership. The ASF licenses this
|
|
# file to you under the Apache License, Version 2.0 (the "License"); you may not
|
|
# use this file except in compliance with the License. You may obtain a copy of
|
|
# the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations under
|
|
# the License.
|
|
#
|
|
# ##############################################################################
|
|
|
|
if(CONFIG_LIBC_ELF)
|
|
|
|
list(
|
|
APPEND
|
|
SRCS
|
|
elf_addrenv.c
|
|
elf_bind.c
|
|
elf_depend.c
|
|
elf_init.c
|
|
elf_iobuffer.c
|
|
elf_load.c
|
|
elf_loadhdrs.c
|
|
elf_verify.c
|
|
elf_read.c
|
|
elf_registry.c
|
|
elf_sections.c
|
|
elf_symbols.c
|
|
elf_symtab.c
|
|
elf_uninit.c
|
|
elf_unload.c
|
|
elf_gethandle.c
|
|
elf_getsymbol.c
|
|
elf_insert.c
|
|
elf_remove.c)
|
|
|
|
list(APPEND SRCS elf_globals.S)
|
|
|
|
target_sources(c PRIVATE ${SRCS})
|
|
|
|
set(ELF_LD_SCRIPT_TMP "${NUTTX_BINARY_DIR}/gnu-elf.ld")
|
|
|
|
nuttx_generate_preprocess_target(
|
|
SOURCE_FILE ${NUTTX_DIR}/libs/libc/elf/gnu-elf.ld.in TARGET_FILE
|
|
${ELF_LD_SCRIPT_TMP})
|
|
|
|
add_custom_target(elfldscript_tmp DEPENDS ${ELF_LD_SCRIPT_TMP})
|
|
add_dependencies(nuttx elfldscript_tmp)
|
|
add_dependencies(apps_post elfldscript_tmp)
|
|
endif()
|