Skip to content

Commit dda7ffd

Browse files
committed
Edit toolchain to work with absl dep
1 parent 4aab0bf commit dda7ffd

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

toolchain/BUILD.bazel

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,23 +91,33 @@ cc_toolchain_config(
9191
cc_toolchain_config(
9292
name = "osx-aarch_64-config",
9393
extra_compiler_flags = [
94-
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1",
95-
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include"
94+
"-I/usr/tools/xcode_14_0/macosx/usr/include/c++/v1",
95+
"-I/usr/tools/xcode_14_0/macosx/usr/include",
96+
"-F/usr/tools/xcode_14_0/macosx/System/Library/Frameworks",
97+
"-Wno-error=nullability-completeness",
98+
"-Wno-error=availability",
99+
"-Wno-error=elaborated-enum-base",
96100
],
101+
extra_linker_flags = ["-framework CoreFoundation"],
97102
linker_path = "/usr/tools",
98-
sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx",
103+
sysroot = "/usr/tools/xcode_14_0/macosx",
99104
target_cpu = "aarch64",
100105
target_full_name = "aarch64-apple-macosx11.3",
101106
)
102107

103108
cc_toolchain_config(
104109
name = "osx-x86_64-config",
105110
extra_compiler_flags = [
106-
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1",
107-
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include"
111+
"-I/usr/tools/xcode_14_0/macosx/usr/include/c++/v1",
112+
"-I/usr/tools/xcode_14_0/macosx/usr/include",
113+
"-F/usr/tools/xcode_14_0/macosx/System/Library/Frameworks",
114+
"-Wno-error=nullability-completeness",
115+
"-Wno-error=availability",
116+
"-Wno-error=elaborated-enum-base",
108117
],
118+
extra_linker_flags = ["-framework CoreFoundation"],
109119
linker_path = "/usr/tools",
110-
sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx",
120+
sysroot = "/usr/tools/xcode_14_0/macosx",
111121
target_cpu = "x86_64",
112122
target_full_name = "x86_64-apple-macosx11.3",
113123
)
@@ -122,6 +132,7 @@ cc_toolchain_config(
122132
extra_include = "/usr/lib/gcc/i686-w64-mingw32",
123133
extra_linker_flags = [
124134
"-L/usr/lib/gcc/i686-w64-mingw32/8.3-posix",
135+
"-ldbghelp",
125136
"-pthread",
126137
],
127138
linker_path = "/usr/bin/ld",
@@ -139,6 +150,7 @@ cc_toolchain_config(
139150
extra_include = "/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include",
140151
extra_linker_flags = [
141152
"-L/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix",
153+
"-ldbghelp",
142154
],
143155
linker_path = "/usr/bin/ld",
144156
sysroot = "/usr/x86_64-w64-mingw32",

0 commit comments

Comments
 (0)