Author: hans Date: Tue Aug 18 19:06:22 2015 New Revision: 245393 URL: http://llvm.org/viewvc/llvm-project?rev=245393&view=rev Log: Merging r244902: ------------------------------------------------------------------------ r244902 | martell | 2015-08-13 08:41:04 -0700 (Thu, 13 Aug 2015) | 12 lines
Driver: Fix include directories when not using libgcc under mingw Summary: When we want to use mingw-w64 and clang with compiler-rt we should not need to have libgcc installed. This fixes finding includes when libgcc is not installed Reviewers: yaron.keren Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D11808 ------------------------------------------------------------------------ Added: cfe/branches/release_37/test/Driver/Inputs/mingw_clang_tree/ - copied from r244902, cfe/trunk/test/Driver/Inputs/mingw_clang_tree/ Modified: cfe/branches/release_37/ (props changed) cfe/branches/release_37/lib/Driver/MinGWToolChain.cpp cfe/branches/release_37/test/Driver/mingw.cpp Propchange: cfe/branches/release_37/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Aug 18 19:06:22 2015 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243085,243098,243101,243105,243133,243144,243153,243196,243206,243277,243280,243285,243289,243343,243417,243463,243538,243594,243642-243644,243851,243945-243950,243964,244000,244193,244266,244468,244488,244502,244719,244794,245041,245259 +/cfe/trunk:242244,242285,242293,242297,242313,242382,242422,242499,242574,242600,242660,242662,242667,242678,242766,242854,242905,242973,243018,243048,243085,243098,243101,243105,243133,243144,243153,243196,243206,243277,243280,243285,243289,243343,243417,243463,243538,243594,243642-243644,243851,243945-243950,243964,244000,244193,244266,244468,244488,244502,244719,244794,244902,245041,245259 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Modified: cfe/branches/release_37/lib/Driver/MinGWToolChain.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/lib/Driver/MinGWToolChain.cpp?rev=245393&r1=245392&r2=245393&view=diff ============================================================================== --- cfe/branches/release_37/lib/Driver/MinGWToolChain.cpp (original) +++ cfe/branches/release_37/lib/Driver/MinGWToolChain.cpp Tue Aug 18 19:06:22 2015 @@ -47,7 +47,7 @@ void MinGW::findGccLibDir() { Archs.emplace_back(getTriple().getArchName()); Archs[0] += "-w64-mingw32"; Archs.emplace_back("mingw32"); - Arch = "unknown"; + Arch = Archs[0].str(); // lib: Arch Linux, Ubuntu, Windows // lib64: openSUSE Linux for (StringRef CandidateLib : {"lib", "lib64"}) { Modified: cfe/branches/release_37/test/Driver/mingw.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_37/test/Driver/mingw.cpp?rev=245393&r1=245392&r2=245393&view=diff ============================================================================== --- cfe/branches/release_37/test/Driver/mingw.cpp (original) +++ cfe/branches/release_37/test/Driver/mingw.cpp Tue Aug 18 19:06:22 2015 @@ -1,3 +1,8 @@ +// RUN: %clang -target i686-windows-gnu -c -### --sysroot=%S/Inputs/mingw_clang_tree/mingw32 %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_CLANG_TREE %s +// CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}i686-w64-mingw32{{/|\\\\}}include" +// CHECK_MINGW_CLANG_TREE: "{{.*}}/Inputs/mingw_clang_tree/mingw32{{/|\\\\}}include" + + // RUN: %clang -target i686-pc-windows-gnu -stdlib=libstdc++ -c -### --sysroot=%S/Inputs/mingw_mingw_org_tree/mingw %s 2>&1 | FileCheck -check-prefix=CHECK_MINGW_ORG_TREE %s // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++" // CHECK_MINGW_ORG_TREE: "{{.*}}/Inputs/mingw_mingw_org_tree/mingw{{/|\\\\}}lib{{/|\\\\}}gcc{{/|\\\\}}mingw32{{/|\\\\}}4.8.1{{/|\\\\}}include{{/|\\\\}}c++{{/|\\\\}}mingw32" _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
