From 54616ab7275dfbd00f668c68973170ab760e3d79 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Thu, 23 Jun 2022 14:01:55 -0500 Subject: [PATCH] build: override CMAKE_ARGS for Windows+MSYS2 environments re: libbacktrace Otherwise `-G"MinGW Makefiles"` is included in `CMAKE_ARGS`, which does not function correctly in MSYS2 Bash. --- Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e72d8e66..6ff3c20d 100644 --- a/Makefile +++ b/Makefile @@ -96,8 +96,18 @@ codex.nims: ln -s codex.nimble $@ # nim-libbacktrace +LIBBACKTRACE_MAKE_FLAGS := -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0 libbacktrace: - + $(MAKE) -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0 +ifeq ($(detected_OS), Windows) +# MSYS2 detection +ifneq ($(MSYSTEM),) + + $(MAKE) $(LIBBACKTRACE_MAKE_FLAGS) CMAKE_ARGS="-G'MSYS Makefiles'" +else + + $(MAKE) $(LIBBACKTRACE_MAKE_FLAGS) +endif +else + + $(MAKE) $(LIBBACKTRACE_MAKE_FLAGS) +endif coverage: $(MAKE) NIMFLAGS="--lineDir:on --passC:-fprofile-arcs --passC:-ftest-coverage --passL:-fprofile-arcs --passL:-ftest-coverage" testAll