File tree Expand file tree Collapse file tree 1 file changed +16
-1
lines changed
src/bootstrap/src/core/config Expand file tree Collapse file tree 1 file changed +16
-1
lines changed Original file line number Diff line number Diff line change @@ -1885,6 +1885,22 @@ impl Config {
18851885 warn ( "link-shared" ) ;
18861886 }
18871887
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+
18881904 // None of the LLVM options, except assertions, are supported
18891905 // when using downloaded LLVM. We could just ignore these but
18901906 // that's potentially confusing, so force them to not be
@@ -1894,7 +1910,6 @@ impl Config {
18941910 check_ci_llvm ! ( optimize_toml) ;
18951911 check_ci_llvm ! ( thin_lto) ;
18961912 check_ci_llvm ! ( release_debuginfo) ;
1897- check_ci_llvm ! ( libzstd) ;
18981913 check_ci_llvm ! ( targets) ;
18991914 check_ci_llvm ! ( experimental_targets) ;
19001915 check_ci_llvm ! ( clang_cl) ;
You can’t perform that action at this time.
0 commit comments