Skip to content

Commit d000065

Browse files
committed
Revert "Change to defaulting on"
This reverts commit b1f6a89. This change is causing some instability with incremental builds, so we're backing it out. Fixes rdar://problem/59016969.
1 parent f4cef57 commit d000065

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

lib/Driver/Driver.cpp

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

965965
const bool OnlyOneDependencyFile =
966966
ArgList->hasFlag(options::OPT_enable_only_one_dependency_file,
967-
options::OPT_disable_only_one_dependency_file, true);
967+
options::OPT_disable_only_one_dependency_file, false);
968968

969969
// relies on the new dependency graph
970970
// Get the default from the initializer in LangOptions.

test/Driver/advanced_output_file_map.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,15 @@
8282
// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "ld{{(.exe)?}}", inputs: ["./obj/advanced_output_file_map.o", "./obj/main.o", "./obj/lib.o", "./OutputFileMap.swiftmodule"], output: {image: "./advanced_output_file_map.out"}
8383
// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "dsymutil{{(\.exe)?}}", inputs: ["./advanced_output_file_map.out"], output: {dSYM: "./advanced_output_file_map.out.dSYM"}
8484

85-
// Defaulting to: -enable-only-one-dependency-file
85+
// Defaulting to: -disable-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-ENA
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
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-ENA
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+
93+
// Should be no dummy files:
9294
// RUN: test ! -e %t/d/advanced_output_file_map.d
93-
// RUN: test -e %t/d/main.d -a ! -s %t/d/main.d
94-
// RUN: test -e %t/d/lib.d -a ! -s %t/d/lib.d
95+
// RUN: test ! -e %t/d/main.d -a ! -s %t/d/main.d
96+
// RUN: test ! -e %t/d/lib.d -a ! -s %t/d/lib.d

0 commit comments

Comments
 (0)