From f76df2475356add68212d737acd7da5bba3b64d6 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Sat, 6 Dec 2014 07:54:59 -0300 Subject: deps: Fix 32-bit build of lib{unibilium,termkey,tickit} --- third-party/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 8f1b12213d..859be62adb 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -97,9 +97,10 @@ if(USE_BUNDLED_LIBUNIBILIUM) -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} + BUILD_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} - CFLAGS=-fPIC + CFLAGS+=${CMAKE_C_COMPILER_ARG1} + CFLAGS+=-fPIC INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install) list(APPEND THIRD_PARTY_DEPS libunibilium) endif() @@ -120,10 +121,11 @@ if(USE_BUNDLED_LIBTERMKEY) CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS=-fPIC + CFLAGS+=${CMAKE_C_COMPILER_ARG1} + CFLAGS+=-fPIC install) list(APPEND THIRD_PARTY_DEPS libtermkey) add_dependencies(libtermkey libunibilium) @@ -145,10 +147,11 @@ if(USE_BUNDLED_LIBTICKIT) CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS=-fPIC + CFLAGS+=${CMAKE_C_COMPILER_ARG1} + CFLAGS+=-fPIC install) list(APPEND THIRD_PARTY_DEPS libtickit) add_dependencies(libtickit libtermkey) -- cgit