From a1dce43b50db383aa11458bdfc7aae68e8b00e7c Mon Sep 17 00:00:00 2001 From: Simon Fels Date: Wed, 25 Jan 2017 18:14:09 +0100 Subject: [PATCH] Use host compiler to build emugen utility in cross-build environments --- cmake/LinuxCrossCompile.cmake | 3 +++ external/android-emugl/host/tools/emugen/CMakeLists.txt | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cmake/LinuxCrossCompile.cmake b/cmake/LinuxCrossCompile.cmake index d279424..956249d 100644 --- a/cmake/LinuxCrossCompile.cmake +++ b/cmake/LinuxCrossCompile.cmake @@ -10,6 +10,9 @@ if (NOT DEFINED AC_GCC_VARIANT) set(AC_GCC_VARIANT $ENV{AC_GCC_VARIANT} CACHE STRING "gcc variant required") endif() +set(HOST_CMAKE_C_COMPILER /usr/bin/cc) +set(HOST_CMAKE_CXX_COMPILER /usr/bin/c++) + set(CMAKE_C_COMPILER /usr/bin/${AC_TARGET_MACHINE}-gcc${AC_GCC_VARIANT}) set(CMAKE_CXX_COMPILER /usr/bin/${AC_TARGET_MACHINE}-g++${AC_GCC_VARIANT}) diff --git a/external/android-emugl/host/tools/emugen/CMakeLists.txt b/external/android-emugl/host/tools/emugen/CMakeLists.txt index dbdca59..8285126 100644 --- a/external/android-emugl/host/tools/emugen/CMakeLists.txt +++ b/external/android-emugl/host/tools/emugen/CMakeLists.txt @@ -1,3 +1,7 @@ +if (NOT "${HOST_CMAKE_CXX_COMPILER}" STREQUAL "") + set (CMAKE_CXX_COMPILER "${HOST_CMAKE_CXX_COMPILER}") +endif() + set(SOURCES ApiGen.cpp EntryPoint.cpp