@@ -45,7 +45,6 @@ def v(*args):
45
45
o ("llvm-link-shared" , "llvm.link-shared" , "prefer shared linking to LLVM (llvm-config --link-shared)" )
46
46
o ("rpath" , "rust.rpath" , "build rpaths into rustc itself" )
47
47
o ("codegen-tests" , "rust.codegen-tests" , "run the tests/codegen tests" )
48
- o ("option-checking" , None , "complain about unrecognized options in this configure script" )
49
48
o ("ninja" , "llvm.ninja" , "build LLVM using the Ninja generator (for MSVC, requires building in the correct environment)" )
50
49
o ("locked-deps" , "build.locked-deps" , "force Cargo.lock to be up to date" )
51
50
o ("vendor" , "build.vendor" , "enable usage of vendored Rust crates" )
@@ -170,6 +169,9 @@ def v(*args):
170
169
v ("host" , None , "List of GNUs ./configure syntax LLVM host triples" )
171
170
v ("target" , None , "List of GNUs ./configure syntax LLVM target triples" )
172
171
172
+ # Options specific to this configure script
173
+ o ("option-checking" , None , "complain about unrecognized options in this configure script" )
174
+ o ("verbose-configure" , None , "don't truncate options when printing them in this configure script" )
173
175
v ("set" , None , "set arbitrary key/value pairs in TOML configuration" )
174
176
175
177
@@ -211,6 +213,8 @@ def is_value_list(key):
211
213
print ('be passed with `--disable-foo` to forcibly disable the option' )
212
214
sys .exit (0 )
213
215
216
+ VERBOSE = False
217
+
214
218
# Parse all command line arguments into one of these three lists, handling
215
219
# boolean and value-based options separately
216
220
def parse_args (args ):
@@ -271,6 +275,9 @@ def parse_args(args):
271
275
if len (need_value_args ) > 0 :
272
276
err ("Option '{0}' needs a value ({0}=val)" .format (need_value_args [0 ]))
273
277
278
+ global VERBOSE
279
+ VERBOSE = 'verbose-configure' in known_args
280
+
274
281
config = {}
275
282
276
283
set ('build.configure-args' , sys .argv [1 :], config )
@@ -290,7 +297,7 @@ def set(key, value, config):
290
297
value = [v for v in value if v ]
291
298
292
299
s = "{:20} := {}" .format (key , value )
293
- if len (s ) < 70 :
300
+ if len (s ) < 70 or VERBOSE :
294
301
p (s )
295
302
else :
296
303
p (s [:70 ] + " ..." )
@@ -371,7 +378,7 @@ def apply_args(known_args, option_checking, config):
371
378
set ('rust.lld' , True , config )
372
379
set ('rust.llvm-tools' , True , config )
373
380
set ('build.extended' , True , config )
374
- elif option .name == 'option-checking' :
381
+ elif option .name in [ 'option-checking' , 'verbose-configure' ] :
375
382
# this was handled above
376
383
pass
377
384
elif option .name == 'dist-compression-formats' :
0 commit comments