diff options
| author | Toon Claes <toon@gitlab.com> | 2021-02-25 12:43:34 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-02-25 12:43:34 +0300 |
| commit | ef061fd0ccb16fadf3d8550c12b27c4cb3159990 (patch) | |
| tree | 952a0af5b7aa1b2e0ae510a190a7cf4fad85965a | |
| parent | 1b7ccef4f189eca94fbc8610fed1d945dfd5a77c (diff) | |
| parent | e08d2630749648c4dac29defc3f3fbf62e0b03fb (diff) | |
Merge branch 'avar/makefile-git-build-cleanup' into 'master'
Makefile: trivial cleanup of git build flags
See merge request gitlab-org/gitaly!3184
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -87,12 +87,10 @@ ifeq (${GIT_BUILD_OPTIONS},) GIT_BUILD_OPTIONS += DEVELOPER=1 # but don't cause warnings to fail the build GIT_BUILD_OPTIONS += DEVOPTS=no-error - GIT_BUILD_OPTIONS += USE_LIBPCRE2=YesPlease + GIT_BUILD_OPTIONS += USE_LIBPCRE=YesPlease GIT_BUILD_OPTIONS += NO_PERL=YesPlease GIT_BUILD_OPTIONS += NO_EXPAT=YesPlease GIT_BUILD_OPTIONS += NO_TCLTK=YesPlease - # fix compilation on musl libc - GIT_BUILD_OPTIONS += NO_REGEX=YesPlease GIT_BUILD_OPTIONS += NO_GETTEXT=YesPlease GIT_BUILD_OPTIONS += NO_PYTHON=YesPlease GIT_BUILD_OPTIONS += NO_INSTALL_HARDLINKS=YesPlease |