1 Commits
Author SHA1 Message Date
anth64 b860b0d607 fix: support MSYS2 builds on gmake
uname -s under MSYS2 never reports Windows_NT, so build.sh picked
bmake.mk and gmake.mk's platform branches silently fell through to
the Linux path (.so + -ldl), breaking the link. Detect MINGW/MSYS/
UCRT/CLANG uname prefixes in build.sh and route to gmake.mk; export
UNAME_S once so make doesn't call uname again. gmake.mk, test/gmake.mk,
and module_template/gmake.mk now derive Windows-vs-Unix from uname
instead of $(OS), with the cmd.exe/batch command path reserved for
environments without a POSIX shell (MSYS2 keeps mkdir -p/rm -rf).
2026-11-10 19:08:11 +01:00
4 changed files with 2 additions and 23 deletions

No files matched your search

-4
View File
@@ -7,10 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
### Fixed
- `build.sh`: install/uninstall no longer requires `doas`/`sudo` under MSYS2, where neither exists and `id -u` never reports root
- `build.bat`: now builds `release` before `install`, no separate manual build step needed
## [1.0.1] - 2026-11-09 ## [1.0.1] - 2026-11-09
### Fixed ### Fixed
-12
View File
@@ -1,14 +1,2 @@
@echo off @echo off
setlocal
set HAS_INSTALL=0
for %%a in (%*) do (
if "%%a"=="install" set HAS_INSTALL=1
)
if "%HAS_INSTALL%"=="1" (
make -f gmake.mk release
if errorlevel 1 exit /b 1
)
make -f gmake.mk %* make -f gmake.mk %*
+1 -6
View File
@@ -10,11 +10,6 @@ case "$OS" in
*) MK_FILE="bmake.mk" ;; *) MK_FILE="bmake.mk" ;;
esac esac
case "$OS" in
mingw*|msys*|ucrt*|clang*) IS_WIN=1 ;;
*) IS_WIN=0 ;;
esac
HAS_INSTALL=0 HAS_INSTALL=0
HAS_UNINSTALL=0 HAS_UNINSTALL=0
for arg in "$@"; do for arg in "$@"; do
@@ -29,7 +24,7 @@ if [ "$HAS_INSTALL" = "1" ] || [ "$HAS_UNINSTALL" = "1" ]; then
make -f "$MK_FILE" release make -f "$MK_FILE" release
fi fi
if [ "$IS_WIN" = "1" ] || [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
PRIV="" PRIV=""
elif command -v doas > /dev/null 2>&1; then elif command -v doas > /dev/null 2>&1; then
PRIV="doas" PRIV="doas"
+1 -1
View File
@@ -3,7 +3,7 @@
#define STK_VERSION_MAJOR 1 #define STK_VERSION_MAJOR 1
#define STK_VERSION_MINOR 0 #define STK_VERSION_MINOR 0
#define STK_VERSION_PATCH 0 #define STK_VERSION_PATCH 1
#define STK_STRINGIFY_HELPER(x) #x #define STK_STRINGIFY_HELPER(x) #x
#define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x) #define STK_STRINGIFY(x) STK_STRINGIFY_HELPER(x)