openharmony/ark_runtime_core
1
0
Fork 0
mirror of https://github.com/openharmony/ark_runtime_core.git synced 2026-07-19 21:23:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

!9 Fixed macos build

Browse Source 
Merge pull request !9 from konstantinbaladurin/fix
This commit is contained in:
openharmony_ci
2021-09-11 08:56:05 +00:00
committed by Gitee
parent 7bf4a4f754 1032afbd44
commit 71aeeaf523
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BUILD.gn
-1
View File
@@ -79,7 +79,6 @@ config("ark_config") {
defines += [
"PANDA_TARGET_UNIX",
"PANDA_TARGET_MACOS",
"PANDA_USE_FUTEX",
]
} else {
defines += [
libpandabase/BUILD.gn
+3 -1
View File
@@ -70,7 +70,6 @@ if (is_mingw) {
"$ark_root/libpandabase/os/unix/error.cpp",
"$ark_root/libpandabase/os/unix/file.cpp",
"$ark_root/libpandabase/os/unix/filesystem.cpp",
"$ark_root/libpandabase/os/unix/futex/mutex.cpp",
"$ark_root/libpandabase/os/unix/library_loader.cpp",
"$ark_root/libpandabase/os/unix/mem.cpp",
"$ark_root/libpandabase/os/unix/native_stack.cpp",
@@ -91,9 +90,12 @@ if (is_mingw) {
if (!is_mac) {
libarkbase_sources += [
"$ark_root/libpandabase/os/unix/exec.cpp",
"$ark_root/libpandabase/os/unix/futex/mutex.cpp",
"$ark_root/libpandabase/os/unix/pipe.cpp",
"$ark_root/libpandabase/os/unix/sighooklib/sighook.cpp",
]
} else {
libarkbase_sources += [ "$ark_root/libpandabase/os/unix/mutex.cpp" ]
}
}
libpandabase/os/unix/failure_retry.h
+12
View File
@@ -18,6 +18,18 @@
#include <unistd.h>
// Mac Os' libc doesn't have this macro
#ifndef TEMP_FAILURE_RETRY
#define TEMP_FAILURE_RETRY(exp) \
(__extension__({ \
decltype(exp) _result; \
do { \
_result = (exp); \
} while (_result == -1 && errno == EINTR); \
_result; \
}))
#endif
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define PANDA_FAILURE_RETRY(exp) (__extension__ TEMP_FAILURE_RETRY(exp))