Skip to content

Commit 18335f4

Browse files
committed
[ELF] Ignore --time-trace if disableOutput
To avoid prevent generating two JSON for LLD_IN_TEST=2 ld.lld --time-trace.
1 parent f359c1f commit 18335f4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lld/ELF/Driver.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1463,7 +1463,8 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
14631463
}
14641464
ctx.arg.thinLTOModulesToCompile =
14651465
args::getStrings(args, OPT_thinlto_single_module_eq);
1466-
ctx.arg.timeTraceEnabled = args.hasArg(OPT_time_trace_eq);
1466+
ctx.arg.timeTraceEnabled =
1467+
args.hasArg(OPT_time_trace_eq) && !ctx.e.disableOutput;
14671468
ctx.arg.timeTraceGranularity =
14681469
args::getInteger(args, OPT_time_trace_granularity, 500);
14691470
ctx.arg.trace = args.hasArg(OPT_trace);

0 commit comments

Comments
 (0)