Skip to content

Commit

Permalink
bugfix: Search for uname in /usr/bin but also /bin
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonah Beckford committed Oct 16, 2024
1 parent f12c98d commit 4f1f8a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- *breaking change*: Remove `git` from being installed during `./dk` on Linux, which presumes that `sudo` or something similar is available to do the installation, and presumes authentication is set up. It was previously being done to let CMake do `FetchContent(GIT_xxx)` in `__dk.cmake`; however, it was never being done for Windows or macOS so it was broken. Instead, user scripts (and system scripts) should handle any Git install + setup themselves. Also, user scripts are long deprecated so this breaking change should affect only system commands.
- The archive format for downloads of DkCoder has switched exclusively to zip archives due to varying incompatible tar support.
- bugfix: Initial `./dk` would fail but subsequent ones would work.
- bugfix: Search for uname in /usr/bin but also /bin

## 2.1.3.2

Expand Down
3 changes: 2 additions & 1 deletion __dk.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ function(__dkcoder_abi)
if(NOT ARG_QUIET AND DEFINED ENV{DKML_HOST_ABI})
message(${ARG_LOGLEVEL} "WARNING: On Linux machines and devices the environment variable DKML_HOST_ABI must be `linux_x86`, `linux_x86_64` or `linux_arm64`. It was ignored because it was: `$ENV{DKML_HOST_ABI}`")
endif()
execute_process(COMMAND /usr/bin/uname -m
find_program(UNAME NAMES uname PATHS /usr/bin /bin NO_DEFAULT_PATH REQUIRED)
execute_process(COMMAND "${UNAME}" -m
OUTPUT_VARIABLE host_machine_type
OUTPUT_STRIP_TRAILING_WHITESPACE
COMMAND_ERROR_IS_FATAL ANY)
Expand Down

0 comments on commit 4f1f8a1

Please sign in to comment.