Skip to content

Support for testing armhf on arm64 host #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slipher merged 3 commits into from
Aug 2, 2026
+7 −3
Merged

Support for testing armhf on arm64 host #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
672f40e
README: fix built_elsewhere example
slipher Jul 30, 2026
9846d0e
scons: add TLS edit targets to all_programs
slipher Jul 30, 2026
a9e5cb4
Allow arm64 Linux hosts with armhf stuff
slipher Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ rsync -az --info=progress2 * testuser@testhost:/home/testuser/nacl-test
Then on the test machine,

```
scons --mode=opt-linux,nacl saigo=1 platform=arm small_tests medium_tests large_tests
scons --mode=opt-linux,nacl saigo=1 platform=arm built_elsewhere=1 naclsdk_validate=0 small_tests medium_tests large_tests
```


Expand Down
6 changes: 4 additions & 2 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1328,10 +1328,12 @@ def ApplyTLSEdit(env, nexe_name, raw_nexe):
tls_edit_exe = env.File(env.SConstructAbsPath(tls_edit_forced))
else:
tls_edit_exe = env['BUILD_ENV'].File('${STAGING_DIR}/tls_edit${PROGSUFFIX}')
return env.Command(
node = env.Command(
nexe_name,
[tls_edit_exe, raw_nexe],
'${SOURCES[0]} --verbose ${SOURCES[1:]} ${TARGET}')
env.Alias('all_programs', node) # Technically incorrect for the IRT which is not a program.
return node

pre_base_env.AddMethod(ApplyTLSEdit)

Expand Down Expand Up @@ -2535,7 +2537,7 @@ def SetUpLinuxEnvX86(env):
LD='i686-linux-gnu-ld')

def SetUpLinuxEnvArm(env):
if not platform.machine().startswith('arm'):
if not platform.machine().startswith('a'):
# Allow emulation on non-ARM hosts.
env.Replace(EMULATOR='qemu-armhf -L /usr/arm-linux-gnueabihf/ -cpu cortex-a9')
if env.Bit('built_elsewhere'):
Expand Down
2 changes: 2 additions & 0 deletions pynacl/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ def GetArch3264(machine=None):
machine = machine.lower()
if machine == 'arm64' and GetOS() == OS_MAC:
machine = ARCH3264_X86_64 # force Intel cross build
elif machine == 'aarch64' and GetOS() == OS_LINUX:
machine = ARCH3264_ARM
assert machine in ARCH3264_DICT, "Unrecognized arch machine: %s" % machine
return ARCH3264_DICT[machine]

Expand Down