Skip to content

Commit b1f6a89

Browse files
author
David Ungar
committed
Change to defaulting on
1 parent 78c7eec commit b1f6a89

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

lib/Driver/Driver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ Driver::buildCompilation(const ToolChain &TC,
954954

955955
const bool OnlyOneDependencyFile =
956956
ArgList->hasFlag(options::OPT_enable_only_one_dependency_file,
957-
options::OPT_disable_only_one_dependency_file, false);
957+
options::OPT_disable_only_one_dependency_file, true);
958958

959959
// relies on the new dependency graph
960960
const bool EnableFineGrainedDependencies =

test/Driver/advanced_output_file_map.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,11 @@
8484

8585
// Defaulting to: -enable-only-one-dependency-file
8686

87-
// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics %/s %/S/Inputs/main.swift %/S/Inputs/lib.swift -g -o ./advanced_output_file_map.out -emit-module-path ./OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t/ofm.json 2>&1 | %FileCheck %/s -check-prefix=DUMPOFM-DIS
87+
// RUN: %swiftc_driver -driver-print-output-file-map -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics %/s %/S/Inputs/main.swift %/S/Inputs/lib.swift -g -o ./advanced_output_file_map.out -emit-module-path ./OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t/ofm.json 2>&1 | %FileCheck %/s -check-prefix=DUMPOFM-ENA
8888

8989

9090
// RUN: %empty-directory(%t/d)
91-
// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics -emit-dependencies %/s %/S/Inputs/main.swift %/S/Inputs/lib.swift -g -o ./advanced_output_file_map.out -emit-module-path ./OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t/ofm.json 2>&1 | %FileCheck %/s -check-prefix=BINDINGS-DIS
92-
// Should be no dummy files:
91+
// RUN: %swiftc_driver -driver-print-bindings -target x86_64-apple-macosx10.9 -emit-executable -emit-module -serialize-diagnostics -emit-dependencies %/s %/S/Inputs/main.swift %/S/Inputs/lib.swift -g -o ./advanced_output_file_map.out -emit-module-path ./OutputFileMap.swiftmodule -module-name OutputFileMap -output-file-map %t/ofm.json 2>&1 | tee /tmp/out | %FileCheck %/s -check-prefix=BINDINGS-ENA
9392
// RUN: test ! -e %t/d/advanced_output_file_map.d
9493
// RUN: test -e %t/d/main.d -a ! -s %t/d/main.d
9594
// RUN: test -e %t/d/lib.d -a ! -s %t/d/lib.d

0 commit comments

Comments
 (0)