diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-09-11 21:27:13 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-09-11 21:27:13 +0200 |
| commit | 11dbfbc5b3da6a0ca0c969c8aa6a30fafb04b819 (patch) | |
| tree | c22ec0c45c8dec5989ebf035ed58a77984b29d0b | |
| parent | Merge pull request #4352 (diff) | |
| parent | Windows: don't preset CMAKE_SYSTEM_NAME (diff) | |
| download | monero-11dbfbc5b3da6a0ca0c969c8aa6a30fafb04b819.tar.xz | |
Merge pull request #4342
6929b524 Windows: don't preset CMAKE_SYSTEM_NAME (iDunk5400)
| -rw-r--r-- | cmake/32-bit-toolchain.cmake | 4 | ||||
| -rw-r--r-- | cmake/64-bit-toolchain.cmake | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/32-bit-toolchain.cmake b/cmake/32-bit-toolchain.cmake index fe9aa483f..253523e66 100644 --- a/cmake/32-bit-toolchain.cmake +++ b/cmake/32-bit-toolchain.cmake @@ -26,7 +26,9 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -set (CMAKE_SYSTEM_NAME Windows) +if (NOT CMAKE_HOST_WIN32) + set (CMAKE_SYSTEM_NAME Windows) +endif() set (GCC_PREFIX i686-w64-mingw32) set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc) diff --git a/cmake/64-bit-toolchain.cmake b/cmake/64-bit-toolchain.cmake index 20b568c71..b4b528347 100644 --- a/cmake/64-bit-toolchain.cmake +++ b/cmake/64-bit-toolchain.cmake @@ -26,7 +26,9 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -set (CMAKE_SYSTEM_NAME Windows) +if (NOT CMAKE_HOST_WIN32) + set (CMAKE_SYSTEM_NAME Windows) +endif() set (GCC_PREFIX x86_64-w64-mingw32) set (CMAKE_C_COMPILER ${GCC_PREFIX}-gcc) |