summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2020-03-09 03:44:41 +0000
committerSadie Powell <sadie@witchery.services>2020-03-09 03:44:41 +0000
commit5960cbcde3ad216b4e69ab3ded57568b738333c0 (patch)
treeb0025c8c1d4af83b2b73b39fdda3e4b273766305
parent5c01f7c08f223ebfa671a9f36ac1fd8203880c9e (diff)
Fix get_cpu_count not being evaluated as a scalar.
This fixes a bug where the changes in 0c34d28447 did not work.
-rwxr-xr-xconfigure2
-rwxr-xr-xtools/test-build2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index fb87c3dd9..ccb551ce5 100755
--- a/configure
+++ b/configure
@@ -431,7 +431,7 @@ print_format <<"EOM";
<|GREEN Execution User:|> $config{USER} ($config{UID})
<|GREEN Socket Engine:|> $config{SOCKETENGINE}
-To build with these settings run '<|GREEN make -j${\get_cpu_count + 1} install|>' now.
+To build with these settings run '<|GREEN make -j${\(get_cpu_count() + 1)} install|>' now.
EOM
diff --git a/tools/test-build b/tools/test-build
index 516af0866..25981d4a6 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -64,7 +64,7 @@ foreach my $compiler (@compilers) {
say "Failed to configure using the $compiler compiler and the $socketengine socket engine!";
exit 1;
}
- if (execute 'make', '--jobs', get_cpu_count + 1, 'install') {
+ if (execute 'make', '--jobs', get_cpu_count() + 1, 'install') {
say "Failed to compile using the $compiler compiler and the $socketengine socket engine!";
exit 1;
}