diff options
| author | Nico Weber <thakis@chromium.org> | 2019-10-30 15:54:09 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2019-10-31 07:34:32 -0400 |
| commit | 4b6597f49896529170fde38f5d5fb46d687e0c71 (patch) | |
| tree | d9e09e5cbd171a96b5f494acaa49697d4c1fd116 | |
| parent | a780b94cd1b03c3642a2662ea59dd6cfa7d6b81f (diff) | |
| download | bcm5719-llvm-4b6597f49896529170fde38f5d5fb46d687e0c71.tar.gz bcm5719-llvm-4b6597f49896529170fde38f5d5fb46d687e0c71.zip | |
Make flang driver stuff work on macOS
6bf55804 added special-case code for TY_PP_Fortran to
ToolChain::LookupTypeForExtension(), but
Darwin::LookupTypeForExtension() overrode that method without calling
the superclass implementation.
Make it call the superclass implementation to fix things.
Differential Revision: https://reviews.llvm.org/D69636
| -rw-r--r-- | clang/lib/Driver/ToolChains/Darwin.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Driver/flang/flang.f90 | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index ee08b8208d9..cb76fb0da18 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -737,7 +737,7 @@ Darwin::Darwin(const Driver &D, const llvm::Triple &Triple, const ArgList &Args) CudaInstallation(D, Triple, Args) {} types::ID MachO::LookupTypeForExtension(StringRef Ext) const { - types::ID Ty = types::lookupTypeForExtension(Ext); + types::ID Ty = ToolChain::lookupTypeForExtension(Ext); // Darwin always preprocesses assembly files (unless -x is used explicitly). if (Ty == types::TY_PP_Asm) diff --git a/clang/test/Driver/flang/flang.f90 b/clang/test/Driver/flang/flang.f90 index 97e4847f843..9d47c7c9022 100644 --- a/clang/test/Driver/flang/flang.f90 +++ b/clang/test/Driver/flang/flang.f90 @@ -1,7 +1,3 @@ -! D63607 made mac builders unhappy by failing this test, and it isn't -! yet obvious why. Mark as unsupported as a temporary measure. -! UNSUPPORTED: darwin - ! Check that flang -fc1 is invoked when in --driver-mode=flang. ! This is a copy of flang_ucase.F90 because the driver has logic in it which |
