mirror of
https://github.com/codex-storage/nim-codex.git
synced 2025-01-09 20:45:38 +00:00
Merge pull request #124 from status-im/build/msys2_fix
build: override CMAKE_ARGS for Windows+MSYS2 environments re: libbacktrace
This commit is contained in:
commit
2f475115d6
12
Makefile
12
Makefile
@ -96,8 +96,18 @@ codex.nims:
|
|||||||
ln -s codex.nimble $@
|
ln -s codex.nimble $@
|
||||||
|
|
||||||
# nim-libbacktrace
|
# nim-libbacktrace
|
||||||
|
LIBBACKTRACE_MAKE_FLAGS := -C vendor/nim-libbacktrace --no-print-directory BUILD_CXX_LIB=0
|
||||||
libbacktrace:
|
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:
|
coverage:
|
||||||
$(MAKE) NIMFLAGS="--lineDir:on --passC:-fprofile-arcs --passC:-ftest-coverage --passL:-fprofile-arcs --passL:-ftest-coverage" testAll
|
$(MAKE) NIMFLAGS="--lineDir:on --passC:-fprofile-arcs --passC:-ftest-coverage --passL:-fprofile-arcs --passL:-ftest-coverage" testAll
|
||||||
|
Loading…
x
Reference in New Issue
Block a user