Change includes

This commit is contained in:
Deanna Garcia 2021-12-03 23:25:36 +00:00
parent a863972644
commit 88076658f1
2 changed files with 7 additions and 1 deletions

View File

@ -47,6 +47,7 @@ cc_toolchain_config(
"-I/usr/aarch64-linux-gnu/include/c++/8/aarch64-linux-gnu/", "-I/usr/aarch64-linux-gnu/include/c++/8/aarch64-linux-gnu/",
"-I/usr/aarch64-linux-gnu/include/c++/8" "-I/usr/aarch64-linux-gnu/include/c++/8"
], ],
extra_include = "/usr/include",
linker_path = "/usr/bin/ld", linker_path = "/usr/bin/ld",
target_cpu = "aarch64", target_cpu = "aarch64",
target_full_name = "aarch64-linux-gnu", target_full_name = "aarch64-linux-gnu",
@ -62,6 +63,7 @@ cc_toolchain_config(
"-I/usr/powerpc64le-linux-gnu/include/c++/8/powerpc64le-linux-gnu/", "-I/usr/powerpc64le-linux-gnu/include/c++/8/powerpc64le-linux-gnu/",
"-I/usr/powerpc64le-linux-gnu/include/c++/8/" "-I/usr/powerpc64le-linux-gnu/include/c++/8/"
], ],
extra_include = "/usr/include"
linker_path = "/usr/bin/ld", linker_path = "/usr/bin/ld",
target_cpu = "ppc64", target_cpu = "ppc64",
target_full_name = "powerpc64le-linux-gnu", target_full_name = "powerpc64le-linux-gnu",
@ -77,6 +79,7 @@ cc_toolchain_config(
"-I/usr/s390x-linux-gnu/include/c++/8/s390x-linux-gnu/", "-I/usr/s390x-linux-gnu/include/c++/8/s390x-linux-gnu/",
"-I/usr/s390x-linux-gnu/include/c++/8/" "-I/usr/s390x-linux-gnu/include/c++/8/"
], ],
extra_include = "/usr/include",
linker_path = "/usr/bin/ld", linker_path = "/usr/bin/ld",
target_cpu = "systemz", target_cpu = "systemz",
target_full_name = "s390x-linux-gnu", target_full_name = "s390x-linux-gnu",
@ -88,6 +91,7 @@ cc_toolchain_config(
name = "linux-x86_32-config", name = "linux-x86_32-config",
bit_flag = "-m32", bit_flag = "-m32",
cpp_flag = "-lstdc++", cpp_flag = "-lstdc++",
extra_include = "/usr/include",
linker_path = "/usr/bin/ld", linker_path = "/usr/bin/ld",
target_cpu = "x86_32", target_cpu = "x86_32",
target_full_name = "i386-linux-gnu", target_full_name = "i386-linux-gnu",
@ -99,6 +103,7 @@ cc_toolchain_config(
name = "linux-x86_64-config", name = "linux-x86_64-config",
bit_flag = "-m64", bit_flag = "-m64",
cpp_flag = "-lstdc++", cpp_flag = "-lstdc++",
extra_include = "/usr/include",
linker_path = "/usr/bin/ld", linker_path = "/usr/bin/ld",
target_cpu = "x86_64", target_cpu = "x86_64",
target_full_name = "x86_64-linux-gnu", target_full_name = "x86_64-linux-gnu",
@ -114,6 +119,7 @@ cc_toolchain_config(
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1", "-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1",
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include" "-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include"
], ],
extra_include = "/usr/include",
linker_path = "/usr/tools", linker_path = "/usr/tools",
sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx", sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx",
target_cpu = "aarch64", target_cpu = "aarch64",
@ -130,6 +136,7 @@ cc_toolchain_config(
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1", "-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1",
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include" "-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include"
], ],
extra_include = "/usr/include",
linker_path = "/usr/tools", linker_path = "/usr/tools",
sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx", sysroot = "/usr/tools/apple_sdks/xcode_13_0/macosx",
target_cpu = "x86_64", target_cpu = "x86_64",

View File

@ -153,7 +153,6 @@ def _impl(ctx):
cxx_builtin_include_directories = [ cxx_builtin_include_directories = [
ctx.attr.toolchain_dir, ctx.attr.toolchain_dir,
ctx.attr.extra_include, ctx.attr.extra_include,
"/usr/include",
"/usr/local/include", "/usr/local/include",
"/usr/local/lib/clang", "/usr/local/lib/clang",
], ],