diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-23 09:53:21 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-23 10:45:44 +0300 |
| commit | 8a71e9c70c598cc2dcbc300b2e67fbf29c194645 (patch) | |
| tree | 4485da34b80cdd0bef64a82cb5b1483c9f299cb5 /Makefile | |
| parent | 16479e5771b69a2b4c22aade7c0a7fc2a6f897ce (diff) | |
Makefile: Fix overriding build options with empty values
While our Makefile provides the ability to override options like git
patches or libgit2 build options, we currently do not treat empty values
as an override. This makes it hard to e.g. use no patches at all.
Fix the issue by testing for whether respective options have been
defined at all instead of testing whether they're non-empty.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -90,14 +90,14 @@ ifeq (${Q},@) GIT_QUIET = --quiet endif -ifeq (${GIT_PATCHES},) +ifndef GIT_PATCHES # Before adding custom patches, please read doc/PROCESS.md#Patching-git # first to make sure your patches meet our acceptance criteria. Patches # must be put into `_support/git-patches`. GIT_PATCHES += pack-bitmap-avoid-traversal-of-uninteresting-tag.patch endif -ifeq (${GIT_BUILD_OPTIONS},) +ifndef GIT_BUILD_OPTIONS # activate developer checks GIT_BUILD_OPTIONS += DEVELOPER=1 # but don't cause warnings to fail the build @@ -117,7 +117,7 @@ LIBGIT2_SOURCE_DIR ?= ${DEPENDENCY_DIR}/libgit2/source LIBGIT2_BUILD_DIR ?= ${DEPENDENCY_DIR}/libgit2/build LIBGIT2_INSTALL_DIR ?= ${DEPENDENCY_DIR}/libgit2/install -ifeq (${LIBGIT2_BUILD_OPTIONS},) +ifndef LIBGIT2_BUILD_OPTIONS LIBGIT2_BUILD_OPTIONS += -DTHREADSAFE=ON LIBGIT2_BUILD_OPTIONS += -DBUILD_CLAR=OFF LIBGIT2_BUILD_OPTIONS += -DBUILD_SHARED_LIBS=OFF @@ -440,7 +440,7 @@ ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a: ${DEPENDENCY_DIR}/libgit2.version ${Q}CMAKE_BUILD_PARALLEL_LEVEL=$(shell nproc) cmake --build ${LIBGIT2_BUILD_DIR} --target install go install -a github.com/libgit2/git2go/${GIT2GO_VERSION} -ifeq (${GIT_USE_PREBUILT_BINARIES},) +ifndef GIT_USE_PREBUILT_BINARIES ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git.version ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} ${GIT_SOURCE_DIR} ${Q}${GIT} -C "${GIT_SOURCE_DIR}" config remote.origin.url ${GIT_REPO_URL} |