diff options
| author | Tony Theodore <tonyt@logyst.com> | 2015-10-16 01:18:04 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2015-10-16 01:18:04 (GMT) |
| commit | fcafb2b326d29d6559d676d46ed4b137c4f66559 (patch) | |
| tree | aa9397b30a52cd1a98375036b970ff0f7b4c60d0 /src | |
| parent | 23e6a9a2cddc91b72c15b122fc51ab7be2b0d223 (diff) | |
| parent | 0ef2cb3b4067a53f66e328f3d6dbee359d677ffd (diff) | |
| download | mxe-fcafb2b326d29d6559d676d46ed4b137c4f66559.zip mxe-fcafb2b326d29d6559d676d46ed4b137c4f66559.tar.gz mxe-fcafb2b326d29d6559d676d46ed4b137c4f66559.tar.bz2 | |
Merge pull request #933 from LuaAndC/fix-cmake-build
cmake wrapper: don't pass -DCMAKE_TOOLCHAIN_FILE to cmake when with --build
Diffstat (limited to 'src')
| -rw-r--r-- | src/mxe-conf.mk | 18 |
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' |