diff options
| author | Michael Reed <m.reed@mykolab.com> | 2015-05-13 17:37:36 -0400 |
|---|---|---|
| committer | Michael Reed <m.reed@mykolab.com> | 2015-05-13 17:37:36 -0400 |
| commit | de7332c0f58d822863e9f8bb8db0ea3e061a54bf (patch) | |
| tree | a6b5dbd5bafa0026d00b4b795cb1345cdd8de422 | |
| parent | e888c479f3d34a1948c63495328b4184ff2ab874 (diff) | |
| parent | 75a884c41d5df5b9bdd91b7058861e96fb6ec8c8 (diff) | |
| download | rneovim-de7332c0f58d822863e9f8bb8db0ea3e061a54bf.tar.gz rneovim-de7332c0f58d822863e9f8bb8db0ea3e061a54bf.tar.bz2 rneovim-de7332c0f58d822863e9f8bb8db0ea3e061a54bf.zip | |
Merge pull request #2634 from Pyrohh/localmk-update
[RFC] contrib: Update local.mk
| -rw-r--r-- | .ci/gcc.sh | 1 | ||||
| -rw-r--r-- | contrib/local.mk.example | 29 |
2 files changed, 21 insertions, 9 deletions
diff --git a/.ci/gcc.sh b/.ci/gcc.sh index 5879fe4b20..3e4ed505da 100644 --- a/.ci/gcc.sh +++ b/.ci/gcc.sh @@ -11,7 +11,6 @@ fi setup_deps x64 CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON \ - -DUSE_JEMALLOC=OFF \ -DUSE_GCOV=ON \ -DBUSTED_OUTPUT_TYPE=plainTerminal" diff --git a/contrib/local.mk.example b/contrib/local.mk.example index 12297eceba..1c3ea4ab40 100644 --- a/contrib/local.mk.example +++ b/contrib/local.mk.example @@ -1,16 +1,12 @@ -# Copy this to 'local.mk' in the repository root to take effect. +# Copy this to 'local.mk' in the repository root. # Individual entries must be uncommented to take effect. # By default, the installation prefix is '/usr/local'. -# CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=/usr/local/neovim-latest +# CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=/usr/local/nvim-latest # These CFLAGS can be used in addition to those specified in CMakeLists.txt: # CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-ftrapv -Wlogical-op" -# By default, the jemalloc family of memory allocation functions are used. -# Uncomment the following to instead use libc memory allocation functions: -# CMAKE_EXTRA_FLAGS="-DUSE_JEMALLOC=OFF" - # Sets the build type; defaults to Debug. Valid values: # # - Debug: Disables optimizations (-O0), enables debug information. @@ -28,8 +24,25 @@ # # CMAKE_BUILD_TYPE := Debug -# By default, all libraries are statically linked to nvim. Uncomment these -# entries to use dynamic linking instead. +# By default, nvim uses bundled versions of its required third-party +# dependencies. +# Uncomment these entries to instead use system-wide installations of +# them. +# +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_BUSTED=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_DEPS=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_JEMALLOC=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBTERMKEY=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBUV=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBVTERM=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUAJIT=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LUAROCKS=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_MSGPACK=OFF +# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_UNIBILIUM=OFF + +# By default, bundled libraries are statically linked to nvim. +# This has no effect for non-bundled deps, which are always dynamically linked. +# Uncomment these entries to instead use dynamic linking. # # CMAKE_EXTRA_FLAGS += -DLIBTERMKEY_USE_STATIC=OFF # CMAKE_EXTRA_FLAGS += -DLIBUNIBILIUM_USE_STATIC=OFF |