diff options
author | 2017-09-12 10:51:44 +0200 | |
---|---|---|
committer | 2017-09-12 14:07:23 +0200 | |
commit | b05bff63d4738a4db1641a13735864ed8e787d96 (patch) | |
tree | 6a337d592a00d17baf14a1e8ab7b1953f0cb119e /src/test/java/com/google/devtools | |
parent | fc06a7568fa4b9e2e425652e6ff83b6662f602d2 (diff) |
Expose sysroot as a build variable
This cl removes hardcoded --sysroot flag generation from bazel when constructing
command line for C++ actions. The hardcoded flag is still exposed to Skylark (to
stay backwards compatible).
RELNOTES: None.
PiperOrigin-RevId: 168346711
Diffstat (limited to 'src/test/java/com/google/devtools')
3 files changed, 665 insertions, 257 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL index f01c9e1fce..0012d76dea 100644 --- a/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/packages/util/MOCK_OSX_CROSSTOOL @@ -825,27 +825,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -1200,6 +1179,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -1221,6 +1222,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -1304,6 +1326,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1326,6 +1349,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1343,6 +1367,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1360,6 +1385,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1377,6 +1403,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1403,6 +1430,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1430,6 +1458,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1445,6 +1474,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1462,6 +1492,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -1632,6 +1663,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -1654,6 +1686,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -2519,27 +2552,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -2894,6 +2906,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -2915,6 +2949,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -2998,6 +3053,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3020,6 +3076,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3037,6 +3094,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3054,6 +3112,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3071,6 +3130,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3097,6 +3157,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3124,6 +3185,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3139,6 +3201,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3156,6 +3219,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -3326,6 +3390,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -3348,6 +3413,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -4213,27 +4279,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -4588,6 +4633,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -4609,6 +4676,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -4692,6 +4780,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4714,6 +4803,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4731,6 +4821,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4748,6 +4839,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4765,6 +4857,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4791,6 +4884,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4818,6 +4912,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4833,6 +4928,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -4850,6 +4946,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -5020,6 +5117,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -5042,6 +5140,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -5907,27 +6006,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -6282,6 +6360,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -6303,6 +6403,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -6386,6 +6507,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6408,6 +6530,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6425,6 +6548,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6442,6 +6566,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6459,6 +6584,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6485,6 +6611,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6512,6 +6639,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6527,6 +6655,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6544,6 +6673,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -6714,6 +6844,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -6736,6 +6867,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -7605,27 +7737,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -7984,6 +8095,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -8005,6 +8138,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -8088,6 +8242,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8110,6 +8265,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8127,6 +8283,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8144,6 +8301,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8161,6 +8319,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8187,6 +8346,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -8215,6 +8375,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -8231,6 +8392,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8248,6 +8410,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -8418,6 +8581,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -8440,6 +8604,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -9311,27 +9476,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -9690,6 +9834,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -9711,6 +9877,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -9794,6 +9981,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -9816,6 +10004,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -9833,6 +10022,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -9850,6 +10040,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -9867,6 +10058,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -9893,6 +10085,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -9921,6 +10114,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -9937,6 +10131,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -9954,6 +10149,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -10124,6 +10320,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -10146,6 +10343,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -11016,27 +11214,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -11421,6 +11598,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -11442,6 +11641,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -11525,6 +11745,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11548,6 +11769,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11566,6 +11788,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11584,6 +11807,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11602,6 +11826,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11629,6 +11854,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -11657,6 +11883,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -11673,6 +11900,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11691,6 +11919,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -11862,6 +12091,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -11884,6 +12114,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -12753,27 +12984,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -13132,6 +13342,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -13153,6 +13385,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -13236,6 +13489,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13258,6 +13512,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13275,6 +13530,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13292,6 +13548,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13309,6 +13566,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13335,6 +13593,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -13363,6 +13622,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "apply_simulator_compiler_flags" } @@ -13379,6 +13639,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13396,6 +13657,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -13566,6 +13828,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -13588,6 +13851,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -14457,27 +14721,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -14858,6 +15101,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -14879,6 +15144,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -14962,6 +15248,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -14984,6 +15271,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15001,6 +15289,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15018,6 +15307,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15035,6 +15325,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15061,6 +15352,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15088,6 +15380,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15103,6 +15396,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15120,6 +15414,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -15290,6 +15585,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -15312,6 +15608,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -16183,27 +16480,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -16584,6 +16860,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -16605,6 +16903,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -16688,6 +17007,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16710,6 +17030,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16727,6 +17048,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16744,6 +17066,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16761,6 +17084,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16787,6 +17111,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16814,6 +17139,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16829,6 +17155,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -16846,6 +17173,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -17016,6 +17344,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -17038,6 +17367,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -17908,27 +18238,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -18335,6 +18644,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -18356,6 +18687,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -18439,6 +18791,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18462,6 +18815,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18480,6 +18834,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18498,6 +18853,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18516,6 +18872,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18543,6 +18900,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -18570,6 +18928,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -18585,6 +18944,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18603,6 +18963,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" implies: "unfiltered_cxx_flags" } @@ -18774,6 +19135,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -18796,6 +19158,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" @@ -19665,27 +20028,6 @@ toolchain { } } feature { - name: "linker_param_file" - flag_set { - action: "c++-link-executable" - action: "c++-link-dynamic-library" - flag_group { - flag: "-Wl,@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - flag_set { - action: "c++-link-static-library" - action: "c++-link-alwayslink-static-library" - action: "c++-link-pic-static-library" - action: "c++-link-alwayslink-pic-static-library" - flag_group { - flag: "@%{linker_param_file}" - } - expand_if_all_available: "linker_param_file" - } - } - feature { name: "version_min" flag_set { action: "objc-executable" @@ -20066,6 +20408,28 @@ toolchain { } } feature { + name: "sysroot" + flag_set { + action: "assemble" + action: "preprocess-assemble" + action: "c-compile" + action: "c++-compile" + action: "c++-module-compile" + action: "objc-compile" + action: "objc++-compile" + action: "c++-header-preprocessing" + action: "c++-header-parsing" + action: "c++-link-executable" + action: "c++-link-dynamic-library" + action: "lto-backend" + action: "clif-match" + flag_group { + flag: "--sysroot=%{sysroot}" + } + expand_if_all_available: "sysroot" + } + } + feature { name: "unfiltered_compile_flags" flag_set { action: "assemble" @@ -20087,6 +20451,27 @@ toolchain { } } feature { + name: "linker_param_file" + flag_set { + action: "c++-link-executable" + action: "c++-link-dynamic-library" + flag_group { + flag: "-Wl,@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + flag_set { + action: "c++-link-static-library" + action: "c++-link-alwayslink-static-library" + action: "c++-link-pic-static-library" + action: "c++-link-alwayslink-pic-static-library" + flag_group { + flag: "@%{linker_param_file}" + } + expand_if_all_available: "linker_param_file" + } + } + feature { name: "dbg_only_flag" flag_set { action: "objc-compile" @@ -20170,6 +20555,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20192,6 +20578,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20209,6 +20596,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20226,6 +20614,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20243,6 +20632,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20269,6 +20659,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20296,6 +20687,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20311,6 +20703,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20328,6 +20721,7 @@ toolchain { implies: "apple_env" implies: "legacy_compile_flags" implies: "user_compile_flags" + implies: "sysroot" implies: "unfiltered_compile_flags" } action_config { @@ -20498,6 +20892,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-dynamic-library" @@ -20520,6 +20915,7 @@ toolchain { implies: "version_min" implies: "apple_env" implies: "cpp_linker_flags" + implies: "sysroot" } action_config { config_name: "c++-link-static-library" diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java index aa9c11edd6..e0fd56322a 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CompileCommandLineTest.java @@ -19,7 +19,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.Root; -import com.google.devtools.build.lib.analysis.ConfiguredTarget; import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.rules.cpp.CcToolchainFeatures.FeatureConfiguration; import com.google.devtools.build.lib.rules.cpp.CompileCommandLine.Builder; @@ -139,8 +138,6 @@ public class CompileCommandLineTest extends BuildViewTestCase { } private Builder makeCompileCommandLineBuilder() throws Exception { - ConfiguredTarget dummyTarget = - scratchConfiguredTarget("a", "a", "cc_binary(name='a', srcs=['a.cc'])"); return CompileCommandLine.builder( scratchArtifact("a/FakeInput"), scratchArtifact("a/FakeOutput"), @@ -152,7 +149,6 @@ public class CompileCommandLineTest extends BuildViewTestCase { }, "c++-compile", getTargetConfiguration().getFragment(CppConfiguration.class), - new DotdFile(scratchArtifact("a/dotD")), - CppHelper.getToolchainUsingDefaultCcToolchainAttribute(getRuleContext(dummyTarget))); + new DotdFile(scratchArtifact("a/dotD"))); } } diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java index 4f48d0d6cf..b772ea74ac 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/LinkBuildVariablesTest.java @@ -325,4 +325,20 @@ public class LinkBuildVariablesTest extends BuildViewTestCase { Variables fissionVariables = getLinkBuildVariables(fissionTarget, LinkTargetType.EXECUTABLE); assertThat(fissionVariables.isAvailable(CppLinkActionBuilder.IS_USING_FISSION_VARIABLE)).isTrue(); } + + @Test + public void testSysrootVariable() throws Exception { + AnalysisMock.get() + .ccSupport() + .setupCrosstool(mockToolsConfig, "builtin_sysroot: '/usr/local/custom-sysroot'"); + useConfiguration(); + + scratch.file("x/BUILD", "cc_binary(name = 'foo', srcs = ['a.cc'])"); + scratch.file("x/a.cc"); + + ConfiguredTarget testTarget = getConfiguredTarget("//x:foo"); + Variables testVariables = getLinkBuildVariables(testTarget, LinkTargetType.EXECUTABLE); + + assertThat(testVariables.isAvailable(CppModel.SYSROOT_VARIABLE_NAME)).isTrue(); + } } |