diff options
| author | Justin Jagieniak <justin@jagieniak.net> | 2021-04-14 10:17:16 +0200 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-04-15 10:07:50 +1000 |
| commit | 1715fef107b2b0fab2b1e2dbac062b3ac7a9c6b2 (patch) | |
| tree | 8ba25346b5a2da7330db85769fa2dc3aa844bfbf /dbug | |
| parent | d1f2001ee6a184cf34005a1aa81c2179308cf537 (diff) | |
| download | mariadb-git-1715fef107b2b0fab2b1e2dbac062b3ac7a9c6b2.tar.gz | |
Fix cross-compile to consider CMAKE_CROSSCOMPILING_EMULATORbb-10.5-danielblack-pr1805-cross-compile
When CMAKE_CROSSCOMPILING_EMULATOR is defined, a cross-compile
can be made, however with native (emulated) execution possible.
This commit takes those points in the build system that
execute built targets natively and allow these to be executed
in a crosscompile if CMAKE_CROSSCOMPILING_EMULATOR is defined.
Closes #1805
Diffstat (limited to 'dbug')
| -rw-r--r-- | dbug/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt index 842099f03f3..d45401be290 100644 --- a/dbug/CMakeLists.txt +++ b/dbug/CMakeLists.txt @@ -25,7 +25,7 @@ MAYBE_DISABLE_IPO(dbug) ADD_EXECUTABLE(tests tests.c) TARGET_LINK_LIBRARIES(tests dbug) -IF(NOT CMAKE_CROSSCOMPILING) +IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) ADD_EXECUTABLE(factorial my_main.c factorial.c) TARGET_LINK_LIBRARIES(factorial dbug) ENDIF() |