This revision was automatically updated to reflect the committed changes. Closed by commit rG4b6597f49896: Make flang driver stuff work on macOS (authored by thakis). Herald added a project: clang. Herald added a subscriber: cfe-commits.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D69636/new/ https://reviews.llvm.org/D69636 Files: clang/lib/Driver/ToolChains/Darwin.cpp clang/test/Driver/flang/flang.f90 Index: clang/test/Driver/flang/flang.f90 =================================================================== --- clang/test/Driver/flang/flang.f90 +++ 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 Index: clang/lib/Driver/ToolChains/Darwin.cpp =================================================================== --- clang/lib/Driver/ToolChains/Darwin.cpp +++ clang/lib/Driver/ToolChains/Darwin.cpp @@ -737,7 +737,7 @@ 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)
Index: clang/test/Driver/flang/flang.f90 =================================================================== --- clang/test/Driver/flang/flang.f90 +++ 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 Index: clang/lib/Driver/ToolChains/Darwin.cpp =================================================================== --- clang/lib/Driver/ToolChains/Darwin.cpp +++ clang/lib/Driver/ToolChains/Darwin.cpp @@ -737,7 +737,7 @@ 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)
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits