motiejus/hermetic_cc_toolchain
1
Fork 0
Code Releases Activity

disable tests on linux arm64

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-07-29 00:10:58 +03:00
parent 5bf03915be
commit fc7335054e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.build.yml
View File

@ -22,10 +22,11 @@ tasks:
--platforms @io_bazel_rules_go//go/toolchain:linux_amd64_cgo \ --platforms @io_bazel_rules_go//go/toolchain:linux_amd64_cgo \
--extra_toolchains @zig_sdk//:linux_amd64_musl_toolchain //test:hello | \ --extra_toolchains @zig_sdk//:linux_amd64_musl_toolchain //test:hello | \
grep -q "ELF 64-bit.* x86-64.* statically linked" grep -q "ELF 64-bit.* x86-64.* statically linked"
- test_aarch64-linux-gnu: | # fcntl64 hack doesn't work on arm64
cd bazel-zig-cc; . .envrc; ./build-and-file \ #- test_aarch64-linux-gnu: |
--platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo //test:hello | \ # cd bazel-zig-cc; . .envrc; ./build-and-file \
grep -q "ELF 64-bit.* ARM aarch64.* dynamically linked" # --platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo //test:hello | \
# grep -q "ELF 64-bit.* ARM aarch64.* dynamically linked"
- test_aarch64-linux-musl: | - test_aarch64-linux-musl: |
cd bazel-zig-cc; . .envrc; ./build-and-file \ cd bazel-zig-cc; . .envrc; ./build-and-file \
--platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo \ --platforms @io_bazel_rules_go//go/toolchain:linux_arm64_cgo \

6
toolchain/defs.bzl
View File

@ -26,7 +26,7 @@ GLIBC_2.2.5 {
fcntl; fcntl;
}; };
""" """
_fcntl_h = """asm (".symver fcntl64, fcntl@GLIBC_2.2.5");\n""" _fcntl_h = """__asm__(".symver fcntl64, fcntl@GLIBC_2.2.5");\n"""
# https://github.com/ziglang/zig/blob/0cfa39304b18c6a04689bd789f5dc4d035ec43b0/src/main.zig#L2962-L2966 # https://github.com/ziglang/zig/blob/0cfa39304b18c6a04689bd789f5dc4d035ec43b0/src/main.zig#L2962-L2966
TARGET_CONFIGS_LISTOFLISTS = [[ TARGET_CONFIGS_LISTOFLISTS = [[
@ -240,8 +240,8 @@ def zig_build_macro(absolute_path, zig_include_root):
linkopts = target_config.linkopts linkopts = target_config.linkopts
copts = target_config.copts copts = target_config.copts
compiler_extra_include = getattr(target_config, "compiler_extra_include", None) compiler_extra_include = getattr(target_config, "compiler_extra_include", "")
linker_version_script = getattr(target_config, "linker_version_script", None) linker_version_script = getattr(target_config, "linker_version_script", "")
if linker_version_script: if linker_version_script:
linkopts = linkopts + ["-Wl,--version-script,%s/%s" % (absolute_path, linker_version_script)] linkopts = linkopts + ["-Wl,--version-script,%s/%s" % (absolute_path, linker_version_script)]
if compiler_extra_include: if compiler_extra_include: