Skip to content

Fix Mac x86 64 builds#158

Merged
fmarier merged 8 commits intomasterfrom
mac-x86_64-builds
Oct 2, 2025
Merged

Fix Mac x86 64 builds#158
fmarier merged 8 commits intomasterfrom
mac-x86_64-builds

Conversation

@fmarier
Copy link
Copy Markdown
Member

@fmarier fmarier commented Oct 2, 2025

This PR harmonizes the way that both arm64 and x86_64 binaries are built and explicitly sets the compilation CPU and HOST so that they can be built on either architecture.

The individual commits are probably easier to review due to the indentation fixes.

FAIL: src/test/unittest_part8.sh

util/monotonic_time_add_msec:
  FAIL src/test/test_util.c:6644: assert(monotime_coarse_diff_msec32_(&ct1, &ct2) OP_GT 1323): 1310 vs 1323
  [monotonic_time_add_msec FAILED]

Filed #155 to re-enable later.
@fmarier fmarier requested a review from mihaiplesa October 2, 2025 19:30
@fmarier fmarier self-assigned this Oct 2, 2025
@fmarier fmarier requested a review from diracdeltas October 2, 2025 19:48
mihaiplesa
mihaiplesa previously approved these changes Oct 2, 2025
@mihaiplesa mihaiplesa requested a review from wknapik October 2, 2025 19:55
FAILED
 regress_debug: OKAY
 regress_debug: http/data_length_constraints:
  FAIL test/regress_http.c:1343: assert(!req)
  [data_length_constraints FAILED]
OKAY
1/296 TESTS FAILED. (41 skipped)
FAILED

Filed #156 to re-enable later.
@fmarier fmarier merged commit 1e6b7b0 into master Oct 2, 2025
5 checks passed
@fmarier fmarier deleted the mac-x86_64-builds branch October 2, 2025 23:01
fmarier added a commit that referenced this pull request Jan 29, 2026
The following test currently fails:

16:34:58  perl ./scripts/maint/checkSpace.pl -C \
16:34:58  		./src/lib/*/*.[ch] ./src/core/*/*.[ch] ./src/feature/*/*.[ch] ./src/app/*/*.[ch] ./src/test/*.[ch] ./src/test/*/*.[ch] ./src/tools/*.[ch]
16:34:58  /opt/homebrew/bin/python3 ./scripts/maint/practracker/includes.py .
16:34:58  ./scripts/maint/checkShellScripts.sh
16:34:58  Unusual pattern permitted.h in ./scripts/maint/practracker/testdata
16:34:58  ./scripts/maint/checkShellScripts.sh: Install shellcheck to check shell scripts.
...
16:35:05  FAIL: scripts/maint/practracker/test_practracker.sh

These tests are already disabled on arm64-apple-darwin (#158).
fmarier added a commit that referenced this pull request Feb 4, 2026
The following test currently fails:

16:34:58  perl ./scripts/maint/checkSpace.pl -C \
16:34:58  		./src/lib/*/*.[ch] ./src/core/*/*.[ch] ./src/feature/*/*.[ch] ./src/app/*/*.[ch] ./src/test/*.[ch] ./src/test/*/*.[ch] ./src/tools/*.[ch]
16:34:58  /opt/homebrew/bin/python3 ./scripts/maint/practracker/includes.py .
16:34:58  ./scripts/maint/checkShellScripts.sh
16:34:58  Unusual pattern permitted.h in ./scripts/maint/practracker/testdata
16:34:58  ./scripts/maint/checkShellScripts.sh: Install shellcheck to check shell scripts.
...
16:35:05  FAIL: scripts/maint/practracker/test_practracker.sh

These tests are already disabled on arm64-apple-darwin (#158).
waybackarchiver pushed a commit to tor-actions/tor-build-scripts that referenced this pull request Feb 6, 2026
* Revert "Disable zlib tests on macOS"

This reverts commit bd0b93e.

* Disable zlib tests on x86_64-apple-darwin

These are broken when cross-compiling for x86_64 on arm64.

* Disable tor tests on x86_64-apple-darwin

The following test currently fails:

16:34:58  perl ./scripts/maint/checkSpace.pl -C \
16:34:58  		./src/lib/*/*.[ch] ./src/core/*/*.[ch] ./src/feature/*/*.[ch] ./src/app/*/*.[ch] ./src/test/*.[ch] ./src/test/*/*.[ch] ./src/tools/*.[ch]
16:34:58  /opt/homebrew/bin/python3 ./scripts/maint/practracker/includes.py .
16:34:58  ./scripts/maint/checkShellScripts.sh
16:34:58  Unusual pattern permitted.h in ./scripts/maint/practracker/testdata
16:34:58  ./scripts/maint/checkShellScripts.sh: Install shellcheck to check shell scripts.
...
16:35:05  FAIL: scripts/maint/practracker/test_practracker.sh

These tests are already disabled on arm64-apple-darwin (brave#158).

* tor update

---------

Co-authored-by: Francois Marier <francois@brave.com>
Co-authored-by: brave-builds <brave-builds+devops@brave.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants