diff options
| author | Nico Weber <thakis@chromium.org> | 2020-07-14 16:41:59 -0400 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-07-15 00:07:20 +0200 |
| commit | 4eb967b5ebd5ca7a00049c7f958011e54b975040 (patch) | |
| tree | 25da6871473ae3484cf3c1c894b287b8be42626c /Ports | |
| parent | 782cd93c012bcad8a96dfd67aeb782ef49d380f9 (diff) | |
| download | serenity-4eb967b5ebd5ca7a00049c7f958011e54b975040.zip | |
LibC+Kernel: Start implementing sysconf
For now, only the non-standard _SC_NPROCESSORS_CONF and
_SC_NPROCESSORS_ONLN are implemented.
Use them to make ninja pick a better default -j value.
While here, make the ninja package script not fail if
no other port has been built yet.
Diffstat (limited to 'Ports')
| -rwxr-xr-x | Ports/ninja/package.sh | 1 | ||||
| -rw-r--r-- | Ports/ninja/patches/nproc.patch | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/Ports/ninja/package.sh b/Ports/ninja/package.sh index 6f56af4fde..977a95aa6e 100755 --- a/Ports/ninja/package.sh +++ b/Ports/ninja/package.sh @@ -13,5 +13,6 @@ build() { } install() { + mkdir -p "${SERENITY_ROOT}/Build/Root/usr/local/bin" cp "${workdir}/ninja" "${SERENITY_ROOT}/Build/Root/usr/local/bin/ninja" } diff --git a/Ports/ninja/patches/nproc.patch b/Ports/ninja/patches/nproc.patch deleted file mode 100644 index 0e383c0ef2..0000000000 --- a/Ports/ninja/patches/nproc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/util.cc b/src/util.cc -index ae94d34..72cf501 100644 ---- a/src/util.cc -+++ b/src/util.cc -@@ -476,7 +476,7 @@ int GetProcessorCount() { - GetNativeSystemInfo(&info); - return info.dwNumberOfProcessors; - #else -- return sysconf(_SC_NPROCESSORS_ONLN); -+ return 1; // FIXME: serenity way of saying sysconf(_SC_NPROCESSORS_ONLN); - #endif - } - |