@@ -38,7 +38,10 @@ filegroup(
3838
3939filegroup (
4040 name = "compiler_deps" ,
41- srcs = glob (["extra_tools/**" ], allow_empty = True ) + [":builtin_include_directory_paths" ],
41+ srcs = glob (
42+ ["extra_tools/**" ],
43+ allow_empty = True ,
44+ ) + [":builtin_include_directory_paths" ],
4245)
4346
4447# This is the entry point for --crosstool_top. Toolchains are found
@@ -56,38 +59,72 @@ cc_toolchain_suite(
5659
5760cc_toolchain (
5861 name = "cc-compiler-k8" ,
59- toolchain_identifier = "local" ,
60- toolchain_config = ":local" ,
6162 all_files = ":compiler_deps" ,
6263 ar_files = ":compiler_deps" ,
6364 as_files = ":compiler_deps" ,
6465 compiler_files = ":compiler_deps" ,
6566 dwp_files = ":empty" ,
6667 linker_files = ":compiler_deps" ,
68+ module_map = None ,
6769 objcopy_files = ":empty" ,
6870 strip_files = ":empty" ,
6971 supports_param_files = 1 ,
70- module_map = None ,
72+ toolchain_config = ":local" ,
73+ toolchain_identifier = "local" ,
7174)
7275
7376cc_toolchain_config (
7477 name = "local" ,
75- cpu = "k8" ,
78+ abi_libc_version = "local" ,
79+ abi_version = "local" ,
80+ compile_flags = [
81+ "-fstack-protector" ,
82+ "-Wall" ,
83+ "-Wunused-but-set-parameter" ,
84+ "-Wno-free-nonheap-object" ,
85+ "-fno-omit-frame-pointer" ,
86+ ],
7687 compiler = "gcc" ,
77- toolchain_identifier = "local" ,
88+ coverage_compile_flags = ["--coverage" ],
89+ coverage_link_flags = ["--coverage" ],
90+ cpu = "k8" ,
91+ cxx_builtin_include_directories = [
92+ "/usr/lib/gcc/x86_64-linux-gnu/9/include" ,
93+ "/usr/local/include" ,
94+ "/usr/include/x86_64-linux-gnu" ,
95+ "/usr/include" ,
96+ "/usr/include/c++/9" ,
97+ "/usr/include/x86_64-linux-gnu/c++/9" ,
98+ "/usr/include/c++/9/backward" ,
99+ ],
100+ cxx_flags = ["-std=c++0x" ],
101+ dbg_compile_flags = ["-g" ],
78102 host_system_name = "local" ,
79- target_system_name = "local" ,
103+ link_flags = [
104+ "-fuse-ld=gold" ,
105+ "-Wl,-no-as-needed" ,
106+ "-Wl,-z,relro,-z,now" ,
107+ "-B/usr/bin" ,
108+ "-pass-exit-codes" ,
109+ ],
110+ link_libs = [
111+ "-lstdc++" ,
112+ "-lm" ,
113+ ],
114+ opt_compile_flags = [
115+ "-g0" ,
116+ "-O2" ,
117+ "-D_FORTIFY_SOURCE=1" ,
118+ "-DNDEBUG" ,
119+ "-ffunction-sections" ,
120+ "-fdata-sections" ,
121+ ],
122+ opt_link_flags = ["-Wl,--gc-sections" ],
123+ supports_start_end_lib = True ,
80124 target_libc = "local" ,
81- abi_version = "local" ,
82- abi_libc_version = "local" ,
83- cxx_builtin_include_directories = ["/usr/lib/gcc/x86_64-linux-gnu/9/include" ,
84- "/usr/local/include" ,
85- "/usr/include/x86_64-linux-gnu" ,
86- "/usr/include" ,
87- "/usr/include/c++/9" ,
88- "/usr/include/x86_64-linux-gnu/c++/9" ,
89- "/usr/include/c++/9/backward" ],
90- tool_paths = {"ar" : "/usr/bin/ar" ,
125+ target_system_name = "local" ,
126+ tool_paths = {
127+ "ar" : "/usr/bin/ar" ,
91128 "ld" : "/usr/bin/ld" ,
92129 "llvm-cov" : "None" ,
93130 "llvm-profdata" : "None" ,
@@ -98,43 +135,21 @@ cc_toolchain_config(
98135 "nm" : "/usr/bin/nm" ,
99136 "objcopy" : "/usr/bin/objcopy" ,
100137 "objdump" : "/usr/bin/objdump" ,
101- "strip" : "/usr/bin/strip" },
102- compile_flags = ["-fstack-protector" ,
103- "-Wall" ,
104- "-Wunused-but-set-parameter" ,
105- "-Wno-free-nonheap-object" ,
106- "-fno-omit-frame-pointer" ],
107- opt_compile_flags = ["-g0" ,
108- "-O2" ,
109- "-D_FORTIFY_SOURCE=1" ,
110- "-DNDEBUG" ,
111- "-ffunction-sections" ,
112- "-fdata-sections" ],
113- dbg_compile_flags = ["-g" ],
114- cxx_flags = ["-std=c++0x" ],
115- link_flags = ["-fuse-ld=gold" ,
116- "-Wl,-no-as-needed" ,
117- "-Wl,-z,relro,-z,now" ,
118- "-B/usr/bin" ,
119- "-pass-exit-codes" ],
120- link_libs = ["-lstdc++" ,
121- "-lm" ],
122- opt_link_flags = ["-Wl,--gc-sections" ],
123- unfiltered_compile_flags = ["-fno-canonical-system-headers" ,
124- "-Wno-builtin-macro-redefined" ,
125- "-D__DATE__=\" redacted\" " ,
126- "-D__TIMESTAMP__=\" redacted\" " ,
127- "-D__TIME__=\" redacted\" " ],
128- coverage_compile_flags = ["--coverage" ],
129- coverage_link_flags = ["--coverage" ],
130- supports_start_end_lib = True ,
138+ "strip" : "/usr/bin/strip" ,
139+ },
140+ toolchain_identifier = "local" ,
141+ unfiltered_compile_flags = [
142+ "-fno-canonical-system-headers" ,
143+ "-Wno-builtin-macro-redefined" ,
144+ "-D__DATE__=\" redacted\" " ,
145+ "-D__TIMESTAMP__=\" redacted\" " ,
146+ "-D__TIME__=\" redacted\" " ,
147+ ],
131148)
132149
133150# Android tooling requires a default toolchain for the armeabi-v7a cpu.
134151cc_toolchain (
135152 name = "cc-compiler-armeabi-v7a" ,
136- toolchain_identifier = "stub_armeabi-v7a" ,
137- toolchain_config = ":stub_armeabi-v7a" ,
138153 all_files = ":empty" ,
139154 ar_files = ":empty" ,
140155 as_files = ":empty" ,
@@ -144,6 +159,8 @@ cc_toolchain(
144159 objcopy_files = ":empty" ,
145160 strip_files = ":empty" ,
146161 supports_param_files = 1 ,
162+ toolchain_config = ":stub_armeabi-v7a" ,
163+ toolchain_identifier = "stub_armeabi-v7a" ,
147164)
148165
149166armeabi_cc_toolchain_config (name = "stub_armeabi-v7a" )
0 commit comments