tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
2index dc26258eac..dd8d30e3d9 100644
3--- a/Modules/CMakeDetermineSystem.cmake
4+++ b/Modules/CMakeDetermineSystem.cmake
5@@ -68,7 +68,7 @@
6 endif()
7 if(_CMAKE_APPLE_SILICON_PROCESSOR)
8 if(";${_CMAKE_APPLE_SILICON_PROCESSOR};" MATCHES "^;(arm64|x86_64);$")
9- execute_process(COMMAND sysctl -q hw.optional.arm64
10+ execute_process(COMMAND @sysctl@ -q hw.optional.arm64
11 OUTPUT_VARIABLE _sysctl_stdout
12 ERROR_VARIABLE _sysctl_stderr
13 RESULT_VARIABLE _sysctl_result
14diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
15index 31dd4346b1..7c4f123a1d 100644
16--- a/Modules/Platform/Darwin-Initialize.cmake
17+++ b/Modules/Platform/Darwin-Initialize.cmake
18@@ -28,7 +28,7 @@
19 if(NOT CMAKE_CROSSCOMPILING AND
20 CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND
21 CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$")
22- execute_process(COMMAND sysctl -q hw.optional.arm64
23+ execute_process(COMMAND @sysctl@ -q hw.optional.arm64
24 OUTPUT_VARIABLE _sysctl_stdout
25 ERROR_VARIABLE _sysctl_stderr
26 RESULT_VARIABLE _sysctl_result
27diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
28index 260b6631c0..ffb8fcd8d2 100644
29--- a/Modules/ProcessorCount.cmake
30+++ b/Modules/ProcessorCount.cmake
31@@ -87,8 +87,7 @@
32
33 if(NOT count)
34 # Mac, FreeBSD, OpenBSD (systems with sysctl):
35- find_program(ProcessorCount_cmd_sysctl sysctl
36- PATHS /usr/sbin /sbin)
37+ set(ProcessorCount_cmd_sysctl @sysctl@)
38 mark_as_advanced(ProcessorCount_cmd_sysctl)
39 if(ProcessorCount_cmd_sysctl)
40 execute_process(COMMAND ${ProcessorCount_cmd_sysctl} -n hw.ncpu
41diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
42index a918b8d9a7..36145707e1 100644
43--- a/Source/kwsys/ProcessUNIX.c
44+++ b/Source/kwsys/ProcessUNIX.c
45@@ -2503,7 +2503,7 @@
46 have two integers to store: the pid and then the ppid. */
47 #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
48 defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
49-# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
50+# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid"
51 # define KWSYSPE_PS_FORMAT "%d %d\n"
52 #elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */
53 # define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid"
54diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
55index 0a7cc380c3..9923dc4ab9 100644
56--- a/Source/kwsys/SystemInformation.cxx
57+++ b/Source/kwsys/SystemInformation.cxx
58@@ -3876,7 +3876,7 @@
59 long long memUsed = 0;
60 pid_t pid = getpid();
61 std::ostringstream oss;
62- oss << "ps -o rss= -p " << pid;
63+ oss << "@ps@ -o rss= -p " << pid;
64 FILE* file = popen(oss.str().c_str(), "r");
65 if (!file) {
66 return -1;
67diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
68index 33bb304cf7..7dbda40a81 100644
69--- a/Tests/CMakeLists.txt
70+++ b/Tests/CMakeLists.txt
71@@ -216,7 +216,7 @@
72 endif()
73
74 if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT DEFINED CMake_TEST_APPLE_SILICON)
75- execute_process(COMMAND sysctl -q hw.optional.arm64
76+ execute_process(COMMAND @sysctl@ -q hw.optional.arm64
77 OUTPUT_VARIABLE _sysctl_stdout
78 ERROR_VARIABLE _sysctl_stderr
79 RESULT_VARIABLE _sysctl_result