Skip to content

Add darwin_x86_64 CPU handling #331

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

Open
keith wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add darwin_x86_64 CPU handling #331

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion third_party/cpuinfo.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,13 @@ cc_library(
linkstatic = select({
# https://github.com/bazelbuild/bazel/issues/11552
":macos_x86_64": False,
":macos_x86_64_legacy": False,
"//conditions:default": True,
}),
defines = select({
# When linkstatic=False, we need default visibility
":macos_x86_64": ["CLOG_VISIBILITY="],
":macos_x86_64_legacy": ["CLOG_VISIBILITY="],
"//conditions:default": [],
}),
strip_include_prefix = "deps/clog/include",
Expand All @@ -132,6 +134,7 @@ cc_library(
":linux_armeabi": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS,
":linux_aarch64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS,
":macos_x86_64": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS,
":macos_x86_64_legacy": COMMON_SRCS + X86_SRCS + MACH_SRCS + MACH_X86_SRCS,
":windows_x86_64": COMMON_SRCS + X86_SRCS + WINDOWS_X86_SRCS,
":android_armv7": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM32_SRCS + ANDROID_ARM_SRCS,
":android_arm64": COMMON_SRCS + ARM_SRCS + LINUX_SRCS + LINUX_ARM64_SRCS + ANDROID_ARM_SRCS,
Expand Down Expand Up @@ -160,6 +163,7 @@ cc_library(
linkstatic = select({
# https://github.com/bazelbuild/bazel/issues/11552
":macos_x86_64": False,
":macos_x86_64_legacy": False,
"//conditions:default": True,
}),
# Headers must be in textual_hdrs to allow us to set the standard to C99
Expand Down Expand Up @@ -239,13 +243,21 @@ config_setting(
)

config_setting(
name = "macos_x86_64",
name = "macos_x86_64_legacy",
values = {
"apple_platform_type": "macos",
"cpu": "darwin",
},
)

config_setting(
name = "macos_x86_64",
values = {
"apple_platform_type": "macos",
"cpu": "darwin_x86_64",
},
)

config_setting(
name = "android",
values = {"crosstool_top": "//external:android/crosstool"},
Expand Down