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).
This commit is contained in:
1 parent
270808e602
commit
b860b0d607
8 files changed
+100
-37
No files matched your search
@@ -1,11 +1,13 @@
|
||||
#!/bin/sh
|
||||
|
||||
OS=$(uname -s | tr '[:upper:]' '[:lower:]')
|
||||
UNAME_S=$(uname -s)
|
||||
export UNAME_S
|
||||
|
||||
if [ "$OS" = "linux" ]; then
|
||||
MK_FILE="gmake.mk"
|
||||
else
|
||||
MK_FILE="bmake.mk"
|
||||
fi
|
||||
OS=$(echo "$UNAME_S" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
case "$OS" in
|
||||
linux|mingw*|msys*|ucrt*|clang*) MK_FILE="gmake.mk" ;;
|
||||
*) MK_FILE="bmake.mk" ;;
|
||||
esac
|
||||
|
||||
make -f "$MK_FILE" "$@"
|
||||
@@ -1,14 +1,32 @@
|
||||
include config.mk
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
SHELL := cmd.exe
|
||||
ifeq ($(UNAME_S),)
|
||||
UNAME_S := $(shell uname -s)
|
||||
endif
|
||||
ifneq (,$(filter MINGW% MSYS% UCRT% CLANG% CYGWIN%,$(UNAME_S)))
|
||||
IS_WINDOWS := 1
|
||||
IS_POSIX_SHELL := 1
|
||||
else ifeq ($(OS),Windows_NT)
|
||||
IS_WINDOWS := 1
|
||||
IS_POSIX_SHELL :=
|
||||
else
|
||||
IS_WINDOWS :=
|
||||
IS_POSIX_SHELL := 1
|
||||
endif
|
||||
|
||||
ifeq ($(IS_WINDOWS),1)
|
||||
MODULE_EXT = .dll
|
||||
MKDIR = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1))
|
||||
RMDIR = if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1))
|
||||
else
|
||||
MODULE_EXT = .so
|
||||
endif
|
||||
|
||||
ifeq ($(IS_POSIX_SHELL),1)
|
||||
MKDIR = mkdir -p $(1)
|
||||
RMDIR = rm -rf $(1)
|
||||
else
|
||||
SHELL := cmd.exe
|
||||
MKDIR = if not exist $(subst /,\,$(1)) mkdir $(subst /,\,$(1))
|
||||
RMDIR = if exist $(subst /,\,$(1)) rd /s /q $(subst /,\,$(1))
|
||||
endif
|
||||
|
||||
CC = cc
|
||||
|
||||
Reference in new issue
Block a user