alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-20 09:19:43 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9904 from bryant/pass-cc-cxx-to-gperf-build

Browse Source 
Configure gperf to build with `CMAKE_C{XX}_COMPILER`.
This commit is contained in:
Björn Linse
2019-04-14 16:55:35 +02:00
committed by GitHub
parent 0be8fb47a4 5613310538
commit d81b510ecf
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
third-party/CMakeLists.txt vendored
View File

@@ -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)

6
third-party/cmake/BuildGperf.cmake vendored
View File

@@ -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)