diff options
| author | Daniel Hahler <git@thequod.de> | 2019-10-14 15:16:58 +0200 |
|---|---|---|
| committer | Daniel Hahler <git@thequod.de> | 2019-10-14 15:17:47 +0200 |
| commit | 327e8ddb183071df0882410efa13605c2a3f0797 (patch) | |
| tree | 551e22225ab184f2d0e0454801b1534b3b9c98f3 | |
| parent | a1f557690f8e801c35a1b882c2a564231e4409a8 (diff) | |
| download | rneovim-327e8ddb183071df0882410efa13605c2a3f0797.tar.gz rneovim-327e8ddb183071df0882410efa13605c2a3f0797.tar.bz2 rneovim-327e8ddb183071df0882410efa13605c2a3f0797.zip | |
[release-0.4] deps: pass LDFLAGS+=-static (#11138)
This is required when `build_old_libs=no` is used in `libtool`.
Fixes https://github.com/neovim/neovim/issues/11198
(cherry picked from commit 2e14dffbb49666bc79c2aa4fd9cea23d7f2f058c)
| -rw-r--r-- | third-party/cmake/BuildLibtermkey.cmake | 1 | ||||
| -rw-r--r-- | third-party/cmake/BuildLibvterm.cmake | 1 | ||||
| -rw-r--r-- | third-party/cmake/BuildUnibilium.cmake | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/third-party/cmake/BuildLibtermkey.cmake b/third-party/cmake/BuildLibtermkey.cmake index b2332ed65a..10e98fbab3 100644 --- a/third-party/cmake/BuildLibtermkey.cmake +++ b/third-party/cmake/BuildLibtermkey.cmake @@ -48,6 +48,7 @@ ExternalProject_Add(libtermkey PREFIX=${DEPS_INSTALL_DIR} PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig CFLAGS=-fPIC + LDFLAGS+=-static ${DEFAULT_MAKE_CFLAGS} install) endif() diff --git a/third-party/cmake/BuildLibvterm.cmake b/third-party/cmake/BuildLibvterm.cmake index e4649986af..61c1c90fa6 100644 --- a/third-party/cmake/BuildLibvterm.cmake +++ b/third-party/cmake/BuildLibvterm.cmake @@ -58,6 +58,7 @@ else() set(LIBVTERM_INSTALL_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} CFLAGS=-fPIC + LDFLAGS+=-static ${DEFAULT_MAKE_CFLAGS} install) endif() diff --git a/third-party/cmake/BuildUnibilium.cmake b/third-party/cmake/BuildUnibilium.cmake index e9deeb4987..74c1cbddb0 100644 --- a/third-party/cmake/BuildUnibilium.cmake +++ b/third-party/cmake/BuildUnibilium.cmake @@ -40,6 +40,7 @@ else() BUILD_COMMAND ${MAKE_PRG} CC=${DEPS_C_COMPILER} PREFIX=${DEPS_INSTALL_DIR} CFLAGS=-fPIC + LDFLAGS+=-static INSTALL_COMMAND ${MAKE_PRG} PREFIX=${DEPS_INSTALL_DIR} install) endif() |