diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-08-30 07:55:06 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-08-30 07:55:06 +0000 |
| commit | ea31efd98eeafeb8b31733f025e1c349e70e0efb (patch) | |
| tree | df2e472910df17e65113a233ad0a9d2b35bb75a1 | |
| parent | b1d148fd5220a6f3326c705db540d7294aa8e535 (diff) | |
| parent | 5f1ef110ffbde5923503a706a81456d869ede81b (diff) | |
| download | uxp-ea31efd98eeafeb8b31733f025e1c349e70e0efb.tar.gz | |
Merge pull request 'Fix a couple miscellaneous Mac specific issues.' (#1998) from dbsoft/UXP:macfixes into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1998
| -rw-r--r-- | media/webrtc/trunk/webrtc/system_wrappers/source/tick_util.cc | 2 | ||||
| -rwxr-xr-x | python/virtualenv/virtualenv.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/webrtc/trunk/webrtc/system_wrappers/source/tick_util.cc b/media/webrtc/trunk/webrtc/system_wrappers/source/tick_util.cc index 4b5f71aa37..cfd26497ae 100644 --- a/media/webrtc/trunk/webrtc/system_wrappers/source/tick_util.cc +++ b/media/webrtc/trunk/webrtc/system_wrappers/source/tick_util.cc @@ -77,7 +77,7 @@ int64_t TickTime::QueryOsForTicks() { if (retval != KERN_SUCCESS) { // TODO(wu): Implement CHECK similar to chrome for all the platforms. // Then replace this with a CHECK(retval == KERN_SUCCESS); -#ifndef WEBRTC_IOS +#if !defined(WEBRTC_IOS) && !defined(__aarch64__) asm("int3"); #else __builtin_trap(); diff --git a/python/virtualenv/virtualenv.py b/python/virtualenv/virtualenv.py index d22207e257..60a42e4dcb 100755 --- a/python/virtualenv/virtualenv.py +++ b/python/virtualenv/virtualenv.py @@ -1346,7 +1346,7 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy raise # Resign the executable, since install_name_tool invalidates the signature - call_subprocess(["codesign", "-s", "-", py_executable]) + call_subprocess(["codesign", "-fs", "-", py_executable]) if not is_win: # Ensure that 'python', 'pythonX' and 'pythonX.Y' all exist |