Skip to content

Commit f24a132

Browse files
committed
Ignore -ffile-compilation-dir when processing swift modules.
1 parent 9c85fbc commit f24a132

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/Basic/LangOptions.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,10 +734,11 @@ namespace {
734734
"-working-directory=",
735735
"-working-directory"};
736736

737-
constexpr std::array<std::string_view, 15>
737+
constexpr std::array<std::string_view, 16>
738738
knownClangDependencyIgnorablePrefiexes = {"-I",
739739
"-F",
740740
"-fmodule-map-file=",
741+
"-ffile-compilation-dir",
741742
"-iquote",
742743
"-idirafter",
743744
"-iframeworkwithsysroot",

test/ScanDependencies/eliminate_unused_vfs.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// RUN: sed -e "s|OUT_DIR|%t/redirects|g" -e "s|IN_DIR|%S/Inputs/CHeaders|g" %t/overlay_template.yaml > %t/overlay.yaml
88

9-
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-cache-path %t/module-cache %t/test.swift -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -Xcc -ivfsoverlay -Xcc %t/overlay.yaml
9+
// RUN: %target-swift-frontend -scan-dependencies -module-load-mode prefer-interface -module-cache-path %t/module-cache %t/test.swift -o %t/deps.json -I %S/Inputs/CHeaders -I %S/Inputs/Swift -disable-implicit-concurrency-module-import -disable-implicit-string-processing-module-import -file-compilation-dir %t -Xcc -ivfsoverlay -Xcc %t/overlay.yaml
1010
// RUN: %validate-json %t/deps.json | %FileCheck %s
1111

1212
//--- overlay_template.yaml
@@ -54,6 +54,7 @@ import F
5454
// CHECK: "-compile-module-from-interface"
5555
// CHECK-NOT: "-ivfsoverlay",
5656
// CHECK-NOT: "{{.*}}{{/|\\}}preserve_used_vfs.swift.tmp{{/|\\}}overlay.yaml",
57+
// CHECK-NOT: "-ffile-compilation-dir={{.*}}"
5758
// CHECK: ],
5859

5960
/// --------Clang module F

0 commit comments

Comments
 (0)