File tree 4 files changed +11
-1
lines changed
ci/docker/dist-x86_64-netbsd
4 files changed +11
-1
lines changed Original file line number Diff line number Diff line change 104
104
# The value specified here will be passed as `-DLLVM_USE_LINKER` to CMake.
105
105
#use-linker = "lld"
106
106
107
+ # Whether or not to specify `-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=YES`
108
+ #allow-old-toolchain = false
107
109
108
110
# =============================================================================
109
111
# General build configuration options
Original file line number Diff line number Diff line change @@ -78,6 +78,7 @@ pub struct Config {
78
78
pub llvm_link_jobs : Option < u32 > ,
79
79
pub llvm_version_suffix : Option < String > ,
80
80
pub llvm_use_linker : Option < String > ,
81
+ pub llvm_allow_old_toolchain : Option < bool > ,
81
82
82
83
pub lld_enabled : bool ,
83
84
pub lldb_enabled : bool ,
@@ -263,6 +264,7 @@ struct Llvm {
263
264
ldflags : Option < String > ,
264
265
use_libcxx : Option < bool > ,
265
266
use_linker : Option < String > ,
267
+ allow_old_toolchain : Option < bool > ,
266
268
}
267
269
268
270
#[ derive( Deserialize , Default , Clone ) ]
@@ -530,6 +532,7 @@ impl Config {
530
532
config. llvm_ldflags = llvm. ldflags . clone ( ) ;
531
533
set ( & mut config. llvm_use_libcxx , llvm. use_libcxx ) ;
532
534
config. llvm_use_linker = llvm. use_linker . clone ( ) ;
535
+ config. llvm_allow_old_toolchain = llvm. allow_old_toolchain . clone ( ) ;
533
536
}
534
537
535
538
if let Some ( ref rust) = toml. rust {
Original file line number Diff line number Diff line change @@ -238,6 +238,10 @@ impl Step for Llvm {
238
238
cfg. define ( "LLVM_USE_LINKER" , linker) ;
239
239
}
240
240
241
+ if let Some ( true ) = builder. config . llvm_allow_old_toolchain {
242
+ cfg. define ( "LLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN" , "YES" ) ;
243
+ }
244
+
241
245
if let Some ( ref python) = builder. config . python {
242
246
cfg. define ( "PYTHON_EXECUTABLE" , python) ;
243
247
}
Original file line number Diff line number Diff line change 33
33
34
34
ENV HOSTS=x86_64-unknown-netbsd
35
35
36
- ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs
36
+ ENV RUST_CONFIGURE_ARGS --enable-extended --disable-docs \
37
+ --set llvm.allow-old-toolchain
37
38
ENV SCRIPT python2.7 ../x.py dist --host $HOSTS --target $HOSTS
You can’t perform that action at this time.
0 commit comments