diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2019-04-14 16:55:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-14 16:55:35 +0200 |
| commit | d81b510ecf1890828caa653ebb2fa053131f3265 (patch) | |
| tree | e7a835dfa2bf610de388b6c5dab7e0da15f07251 | |
| parent | 0be8fb47a46ee472af41dd96c5884e8e69b94639 (diff) | |
| parent | 5613310538cafb12e1fc66ec6471a4312c7134aa (diff) | |
| download | rneovim-d81b510ecf1890828caa653ebb2fa053131f3265.tar.gz rneovim-d81b510ecf1890828caa653ebb2fa053131f3265.tar.bz2 rneovim-d81b510ecf1890828caa653ebb2fa053131f3265.zip | |
Merge pull request #9904 from bryant/pass-cc-cxx-to-gperf-build
Configure gperf to build with `CMAKE_C{XX}_COMPILER`.
| -rw-r--r-- | third-party/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | third-party/cmake/BuildGperf.cmake | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 0b90ea52a4..0a41d502ad 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -97,6 +97,8 @@ else() set(DEPS_C_COMPILER "${CMAKE_C_COMPILER}") endif() +set(DEPS_CXX_COMPILER "${CMAKE_CXX_COMPILER}") + if(CMAKE_OSX_SYSROOT) set(DEPS_C_COMPILER "${DEPS_C_COMPILER} -isysroot${CMAKE_OSX_SYSROOT}") endif() @@ -110,11 +112,13 @@ if(CMAKE_CROSSCOMPILING AND NOT UNIX) set(HOSTDEPS_BIN_DIR "${HOSTDEPS_INSTALL_DIR}/bin") set(HOSTDEPS_LIB_DIR "${HOSTDEPS_INSTALL_DIR}/lib") set(HOSTDEPS_C_COMPILER "${HOST_C_COMPILER}") + set(HOSTDEPS_CXX_COMPILER "${HOST_CXX_COMPILER}") else() set(HOSTDEPS_INSTALL_DIR "${DEPS_INSTALL_DIR}") set(HOSTDEPS_BIN_DIR "${DEPS_BIN_DIR}") set(HOSTDEPS_LIB_DIR "${DEPS_LIB_DIR}") set(HOSTDEPS_C_COMPILER "${DEPS_C_COMPILER}") + set(HOSTDEPS_CXX_COMPILER "${DEPS_CXX_COMPILER}") endif() include(ExternalProject) diff --git a/third-party/cmake/BuildGperf.cmake b/third-party/cmake/BuildGperf.cmake index fa8b35f383..71c3cc1eef 100644 --- a/third-party/cmake/BuildGperf.cmake +++ b/third-party/cmake/BuildGperf.cmake @@ -36,11 +36,15 @@ function(BuildGperf) INSTALL_COMMAND "${_gperf_INSTALL_COMMAND}") endfunction() +set(GPERF_BUILDARGS CC=${HOSTDEPS_C_COMPILER} CXX=${HOSTDEPS_CXX_COMPILER} + LD=${HOSTDEPS_C_COMPILER}) + if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILING)) BuildGperf( CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/gperf/configure - --prefix=${HOSTDEPS_INSTALL_DIR} MAKE=${MAKE_PRG} + --prefix=${HOSTDEPS_INSTALL_DIR} + MAKE=${MAKE_PRG} ${GPERF_BUILDARGS} INSTALL_COMMAND ${MAKE_PRG} install) elseif(MSVC OR MINGW) |