File tree 1 file changed +16
-1
lines changed
src/bootstrap/src/core/config
1 file changed +16
-1
lines changed Original file line number Diff line number Diff line change @@ -1885,6 +1885,22 @@ impl Config {
1885
1885
warn ( "link-shared" ) ;
1886
1886
}
1887
1887
1888
+ // FIXME(#129153): instead of all the ad-hoc `download-ci-llvm` checks that follow,
1889
+ // use the `builder-config` present in tarballs since #128822 to compare the local
1890
+ // config to the ones used to build the LLVM artifacts on CI, and only notify users
1891
+ // if they've chosen a different value.
1892
+
1893
+ if libzstd. is_some ( ) {
1894
+ println ! (
1895
+ "WARNING: when using `download-ci-llvm`, the local `llvm.libzstd` option, \
1896
+ like almost all `llvm.*` options, will be ignored and set by the LLVM CI \
1897
+ artifacts builder config."
1898
+ ) ;
1899
+ println ! (
1900
+ "HELP: To use `llvm.libzstd` for LLVM/LLD builds, set `download-ci-llvm` option to false."
1901
+ ) ;
1902
+ }
1903
+
1888
1904
// None of the LLVM options, except assertions, are supported
1889
1905
// when using downloaded LLVM. We could just ignore these but
1890
1906
// that's potentially confusing, so force them to not be
@@ -1894,7 +1910,6 @@ impl Config {
1894
1910
check_ci_llvm ! ( optimize_toml) ;
1895
1911
check_ci_llvm ! ( thin_lto) ;
1896
1912
check_ci_llvm ! ( release_debuginfo) ;
1897
- check_ci_llvm ! ( libzstd) ;
1898
1913
check_ci_llvm ! ( targets) ;
1899
1914
check_ci_llvm ! ( experimental_targets) ;
1900
1915
check_ci_llvm ! ( clang_cl) ;
You can’t perform that action at this time.
0 commit comments