Skip to content

Commit 463d59d

Browse files
voltur01simpal01
authored andcommitted
Add VERSION.TXT to overlay packages (arm#192)
(cherry picked from commit 4df1548)
1 parent 03293bf commit 463d59d

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

arm-software/embedded/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,10 +503,12 @@ add_custom_target(
503503
-DArmToolchainForEmbedded_VERSION=${ArmToolchainForEmbedded_VERSION}
504504
-DArmToolchainForEmbedded_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
505505
-Dllvmproject_src_dir=${llvmproject_src_dir}
506-
# at most one of picolibc and newlib source dirs is needed, but easiest to
506+
# at most one of picolibc and newlib options is needed, but easiest to
507507
# specify both definitions
508508
-Dpicolibc_SOURCE_DIR=${picolibc_SOURCE_DIR}
509+
-Dpicolibc_URL=${picolibc_URL}
509510
-Dnewlib_SOURCE_DIR=${newlib_SOURCE_DIR}
511+
-Dnewlib_URL=${newlib_URL}
510512
# but we do tell the script which library we're actually using
511513
-DLLVM_TOOLCHAIN_C_LIBRARY=${LLVM_TOOLCHAIN_C_LIBRARY}
512514
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/generate_version_txt.cmake
@@ -516,7 +518,7 @@ install(
516518
FILES
517519
${CMAKE_CURRENT_BINARY_DIR}/VERSION.txt
518520
DESTINATION .
519-
COMPONENT llvm-toolchain-docs
521+
COMPONENT llvm-toolchain-third-party-licenses
520522
)
521523

522524

arm-software/embedded/cmake/VERSION.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Arm Toolchain for Embedded ${armtoolchain_VERSION}
22

33
Sources:
44
* arm-toolchain: https://github.com/arm/arm-toolchain (commit ${armtoolchain_COMMIT})
5-
* Picolibc: https://github.com/picolibc/picolibc.git (commit ${picolibc_COMMIT})
5+
* ${LLVM_TOOLCHAIN_C_LIBRARY}: ${LLVM_TOOLCHAIN_C_LIBRARY_URL} (commit ${LLVM_TOOLCHAIN_C_LIBRARY_COMMIT})

arm-software/embedded/cmake/generate_version_txt.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ if(NOT (LLVM_TOOLCHAIN_C_LIBRARY STREQUAL llvmlibc)) # libc in a separate repo?
3030
OUTPUT_STRIP_TRAILING_WHITESPACE
3131
COMMAND_ERROR_IS_FATAL ANY
3232
)
33+
set(LLVM_TOOLCHAIN_C_LIBRARY_URL ${${base_library}_URL})
34+
set(LLVM_TOOLCHAIN_C_LIBRARY_COMMIT ${${base_library}_COMMIT})
35+
else()
36+
set(LLVM_TOOLCHAIN_C_LIBRARY_URL "https://github.com/arm/arm-toolchain/tree/arm-software/libc")
37+
set(LLVM_TOOLCHAIN_C_LIBRARY_COMMIT ${armtoolchain_COMMIT})
3338
endif()
3439

3540
configure_file(

0 commit comments

Comments
 (0)