diff options
| author | Daniel Hahler <git@thequod.de> | 2019-06-30 01:29:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-30 01:29:10 +0200 |
| commit | 72ae0a6e5eaad939d2f7fe6d2e8a8bcbf00a2ec6 (patch) | |
| tree | a7d01d97cf777c462e1ff7df235b37fb9c78ef47 | |
| parent | 0364f517bbc20607032c56a3875ee4f69f926c25 (diff) | |
| download | rneovim-72ae0a6e5eaad939d2f7fe6d2e8a8bcbf00a2ec6.tar.gz rneovim-72ae0a6e5eaad939d2f7fe6d2e8a8bcbf00a2ec6.tar.bz2 rneovim-72ae0a6e5eaad939d2f7fe6d2e8a8bcbf00a2ec6.zip | |
Makefile: CMAKE_INSTALL_PREFIX: skip parsing CMAKE_EXTRA_FLAGS if set (#10374)
Fixes:
> Recursive variable 'CMAKE_EXTRA_FLAGS' references itself (eventually). Stop.
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -16,12 +16,12 @@ CMAKE_EXTRA_FLAGS ?= # CMAKE_INSTALL_PREFIX # - May be passed directly or as part of CMAKE_EXTRA_FLAGS. # - `checkprefix` target checks that it matches the CMake-cached value. #9615 -ifneq (,$(CMAKE_EXTRA_FLAGS)) -CMAKE_INSTALL_PREFIX ?= $(shell echo $(CMAKE_EXTRA_FLAGS) | 2>/dev/null \ +ifneq (,$(CMAKE_INSTALL_PREFIX)$(CMAKE_EXTRA_FLAGS)) +CMAKE_INSTALL_PREFIX := $(shell echo $(CMAKE_EXTRA_FLAGS) | 2>/dev/null \ grep -o 'CMAKE_INSTALL_PREFIX=[^ ]\+' | cut -d '=' -f2) endif ifneq (,$(CMAKE_INSTALL_PREFIX)) - CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX) +CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX) checkprefix: @if [ -f build/.ran-cmake ]; then \ |