summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mxe-conf.mk18
1 files changed, 15 insertions, 3 deletions
diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk
index 5a0fd6b..5d814de 100644
--- a/src/mxe-conf.mk
+++ b/src/mxe-conf.mk
@@ -46,9 +46,21 @@ define $(PKG)_BUILD_COMMON
) > '$(CMAKE_TOOLCHAIN_FILE)'
#create prefixed cmake wrapper script
- (echo '#!/bin/sh'; \
- echo 'echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \
- echo 'exec cmake -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"') \
+ (echo '#!/usr/bin/env bash'; \
+ echo 'echo "== Using MXE wrapper: $(PREFIX)/bin/$(TARGET)-cmake"'; \
+ echo 'unset NO_MXE_TOOLCHAIN'; \
+ echo 'if echo -- "$$@" | grep -Ewq "(--build|-E|--system-information)" ; then'; \
+ echo ' NO_MXE_TOOLCHAIN=1'; \
+ echo 'fi'; \
+ echo 'if [[ "$$NO_MXE_TOOLCHAIN" == "1" ]]; then'; \
+ echo ' echo "== Skip using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \
+ echo ' # see https://github.com/mxe/mxe/issues/932'; \
+ echo ' exec cmake "$$@"'; \
+ echo 'else'; \
+ echo ' echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \
+ echo ' exec cmake -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \
+ echo 'fi'; \
+ ) \
> '$(PREFIX)/bin/$(TARGET)-cmake'
chmod 0755 '$(PREFIX)/bin/$(TARGET)-cmake'