diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-06-02 15:54:36 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-06-02 15:54:36 +0300 |
| commit | dc1c9f3a501cb21820ebe2350de5aa687f59cf8a (patch) | |
| tree | 4659963f0732a298c865cb362171422bfcf8590a /_support | |
| parent | f3d0de62f26dee6245478eff26fdae945f929a13 (diff) | |
| parent | fd4d7395b18474b43a6ed29fdc577528dc24e4db (diff) | |
Merge branch 'pks-build-git-fixes' into 'master'
Fix build-git target on musl-based systems
See merge request gitlab-org/gitaly!2171
Diffstat (limited to '_support')
| -rw-r--r-- | _support/makegen.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 3a7179acd..12c408c2b 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -369,12 +369,13 @@ func (gm *gitalyMake) GitSourceDir() string { return filepath.Join(gm.BuildDir() func (gm *gitalyMake) GitBuildOptions() string { buildOptions := []string{ - "-j 8", // use multiple parallele jobs - "DEVELOPER=1", // activate developer checks - "CFLAGS='-O0 -g3'", // make it easy to debug in case of crashes + fmt.Sprintf("-j%v", runtime.NumCPU() + 1), // use multiple parallele jobs + "DEVELOPER=1", // activate developer checks + "CFLAGS='-O0 -g3'", // make it easy to debug in case of crashes "NO_PERL=YesPlease", "NO_EXPAT=YesPlease", "NO_TCLTK=YesPlease", + "NO_REGEX=YesPlease", // fix compilation on musl libc "NO_GETTEXT=YesPlease", "NO_PYTHON=YesPlease", "NO_INSTALL_HARDLINKS=YesPlease", |