Merge branch 'development' into gctx

HaxeFoundation · Nov 22, 2024 · 8b8c3b1 · 8b8c3b1
2 parents b296662 + a25a3c6
commit 8b8c3b1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -501,6 +501,7 @@ jobs:
         run: |
           set -ex
           brew update
+          brew uninstall --force pkg-config
           brew bundle --file=tests/Brewfile --no-upgrade
           cpanm IPC::System::Simple
           cpanm String::ShellQuote

diff --git a/extra/github-actions/build-mac.yml b/extra/github-actions/build-mac.yml
@@ -7,6 +7,7 @@
   run: |
     set -ex
     brew update
+    brew uninstall --force pkg-config
     brew bundle --file=tests/Brewfile --no-upgrade
     cpanm IPC::System::Simple
     cpanm String::ShellQuote

diff --git a/std/Sys.hx b/std/Sys.hx
@@ -139,8 +139,10 @@ extern class Sys {
 	static function time():Float;
 
 	/**
-		Gives the most precise timestamp value available (in seconds),
-		but only accounts for the actual time spent running on the CPU for the current thread/process.
+    		Returns CPU time consumed by the current process or thread, measured in seconds.
+		This value only includes the actual time the CPU has actively spent executing 
+		instructions for the process/thread and excludes idle or sleep time. The precision 
+		and behavior may vary depending on the platform and underlying implementation.
 	**/
 	static function cpuTime():Float;