smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move `-j4` option in `make_options` 

This way we can remove it when on Windows.
This commit is contained in:
Matthieu Gautier 2024-08-21 17:15:12 +02:00
parent 702292c14c
commit 7fbeb2fc6d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kiwixbuild/dependencies/base.py
View File

@ -2,6 +2,7 @@ import subprocess
import os import os
import shutil import shutil
import time import time
import platform
from kiwixbuild.utils import ( from kiwixbuild.utils import (
pj, pj,
@ -379,7 +380,7 @@ class MakeBuilder(Builder):
configure_options = [] configure_options = []
dynamic_configure_options = ["--enable-shared", "--disable-static"] dynamic_configure_options = ["--enable-shared", "--disable-static"]
static_configure_options = ["--enable-static", "--disable-shared"] static_configure_options = ["--enable-static", "--disable-shared"]
make_options = [] make_options = ["-j4"]
install_options = [] install_options = []
configure_script = "configure" configure_script = "configure"
configure_env = { configure_env = {
@ -435,7 +436,6 @@ class MakeBuilder(Builder):
command = [ command = [
*self.buildEnv.make_wrapper, *self.buildEnv.make_wrapper,
*neutralEnv("make_command"), *neutralEnv("make_command"),
"-j4",
*self.make_targets, *self.make_targets,
*self.make_options, *self.make_options,
] ]
@ -492,6 +492,12 @@ class QMakeBuilder(MakeBuilder):
qmake_targets = [] qmake_targets = []
flatpak_buildsystem = "qmake" flatpak_buildsystem = "qmake"
@property
def make_options(self):
if platform.system() == "Windows":
return []
return super().make_options
@property @property
def env_options(self): def env_options(self):
if "QMAKE_CC" in os.environ: if "QMAKE_CC" in os.environ: