diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-12-06 09:15:53 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-12-06 09:15:53 -0300 |
| commit | f1a934808aac5162f215636c91e7de193ae29a17 (patch) | |
| tree | c2bf47dd261aa96fc8bbc396e6e9963d3f6d8797 | |
| parent | 33530ac9a49eafc08a50459b95b23f02efd2bfea (diff) | |
| download | rneovim-f1a934808aac5162f215636c91e7de193ae29a17.tar.gz rneovim-f1a934808aac5162f215636c91e7de193ae29a17.tar.bz2 rneovim-f1a934808aac5162f215636c91e7de193ae29a17.zip | |
Revert "deps: Fix 32-bit build of lib{unibilium,termkey,tickit}"
This reverts commit f76df2475356add68212d737acd7da5bba3b64d6.
| -rw-r--r-- | third-party/CMakeLists.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 859be62adb..8f1b12213d 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -97,10 +97,9 @@ if(USE_BUNDLED_LIBUNIBILIUM) -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 - BUILD_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} + BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} - CFLAGS+=${CMAKE_C_COMPILER_ARG1} - CFLAGS+=-fPIC + CFLAGS=-fPIC INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install) list(APPEND THIRD_PARTY_DEPS libunibilium) endif() @@ -121,11 +120,10 @@ if(USE_BUNDLED_LIBTERMKEY) CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS+=${CMAKE_C_COMPILER_ARG1} - CFLAGS+=-fPIC + CFLAGS=-fPIC install) list(APPEND THIRD_PARTY_DEPS libtermkey) add_dependencies(libtermkey libunibilium) @@ -147,11 +145,10 @@ if(USE_BUNDLED_LIBTICKIT) CONFIGURE_COMMAND "" BUILD_IN_SOURCE 1 BUILD_COMMAND "" - INSTALL_COMMAND ${MAKE_PRG} CC=${CMAKE_C_COMPILER} + INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig - CFLAGS+=${CMAKE_C_COMPILER_ARG1} - CFLAGS+=-fPIC + CFLAGS=-fPIC install) list(APPEND THIRD_PARTY_DEPS libtickit) add_dependencies(libtickit libtermkey) |