averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change to defaulting on"

Browse Source 
This reverts commit b1f6a8941c. This
change is causing some instability with incremental builds, so we're
backing it out. Fixes rdar://problem/59016969.
This commit is contained in:
Doug Gregor
2020-02-11 15:34:48 -08:00
parent f4cef5715a
commit d000065ab1
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Driver/Driver.cpp
View File

@@ -964,7 +964,7 @@ Driver::buildCompilation(const ToolChain &TC,
const bool OnlyOneDependencyFile =
ArgList->hasFlag(options::OPT_enable_only_one_dependency_file,
options::OPT_disable_only_one_dependency_file, true);
options::OPT_disable_only_one_dependency_file, false);
// relies on the new dependency graph
// Get the default from the initializer in LangOptions.

12
test/Driver/advanced_output_file_map.swift
View File

@@ -82,13 +82,15 @@
// 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"}
// BINDINGS-ENA: # "x86_64-apple-macosx10.9" - "dsymutil{{(\.exe)?}}", inputs: ["./advanced_output_file_map.out"], output: {dSYM: "./advanced_output_file_map.out.dSYM"}
// Defaulting to: -enable-only-one-dependency-file
// Defaulting to: -disable-only-one-dependency-file
// 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
// 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
// RUN: %empty-directory(%t/d)
// 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
// 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
// Should be no dummy files:
// RUN: test ! -e %t/d/advanced_output_file_map.d
// RUN: test -e %t/d/main.d -a ! -s %t/d/main.d
// RUN: test -e %t/d/lib.d -a ! -s %t/d/lib.d
// RUN: test ! -e %t/d/main.d -a ! -s %t/d/main.d
// RUN: test ! -e %t/d/lib.d -a ! -s %t/d/lib.d