Skip to content

attempt to get this repo working again #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

attempt to get this repo working again #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f11254
update versions.json to fix build
walkingeyerobot Jul 5, 2025
0a03895
closer
walkingeyerobot Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
build/
14 changes: 7 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ include(ExternalProject)
include(FetchContent)

# Read which revisions of the repos to use.
file(READ versions.json VERSIONS_JSON)
function(read_repo_version output_variable_prefix repo)
string(JSON tag GET ${VERSIONS_JSON} "repos" "${repo}" "tag")
string(JSON tagType GET ${VERSIONS_JSON} "repos" "${repo}" "tagType")
file(READ versions.json VERSIONZ_JSON)
function(read_repo_versionz output_variable_prefix repo)
string(JSON tag GET ${VERSIONZ_JSON} "repos" "${repo}" "tag")
string(JSON tagType GET ${VERSIONZ_JSON} "repos" "${repo}" "tagType")
if(tagType STREQUAL "commithash")
# GIT_SHALLOW doesn't work with commit hashes.
set(shallow OFF)
Expand All @@ -124,10 +124,10 @@ function(read_repo_version output_variable_prefix repo)
set(${output_variable_prefix}_TAG "${tag}" PARENT_SCOPE)
set(${output_variable_prefix}_SHALLOW "${shallow}" PARENT_SCOPE)
endfunction()
read_repo_version(bmt bmt)
read_repo_versionz(bmt bmt)

FetchContent_Declare(bmt
GIT_REPOSITORY https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm
GIT_REPOSITORY https://github.com/arm/arm-toolchain
GIT_TAG "${bmt_TAG}"
GIT_SHALLOW "${bmt_SHALLOW}"
GIT_PROGRESS TRUE
Expand Down Expand Up @@ -211,7 +211,7 @@ set(LLDB_INCLUDE_TESTS OFF CACHE INTERNAL "")
set(LLVM_TOOLCHAIN_LIBRARY_VARIANTS armv4t CACHE INTERNAL "")

add_subdirectory(
${bmt_SOURCE_DIR}
${bmt_SOURCE_DIR}/arm-software/embedded
)

install(
Expand Down
2 changes: 1 addition & 1 deletion versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"bmt": {
"comment": "tagType can be branch, tag or commithash",
"tagType": "branch",
"tag": "main"
"tag": "arm-software"
}
}
}