<div dir="ltr">I've submitted r220434. That should fix it for you.</div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Oct 22, 2014 at 2:37 PM, Alexander Potapenko <span dir="ltr"><<a href="mailto:glider@google.com" target="_blank">glider@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This broke our internal OSX bot:<br>
<br>
/Users/buildbot/src/llvm-buildbot/slave/mac10.9-cmake/build/llvm/tools/clang/lib/Driver/MSVCToolChain.cpp:245:22:<br>
error: ISO C++11 does not allow conversion from string literal to<br>
'char *' [-Werror,-Wwritable-strings]<br>
<span class=""> char *tests[] = {"winv6.3", "win8", "win7"};<br>
</span> ^<br>
/Users/buildbot/src/llvm-buildbot/slave/mac10.9-cmake/build/llvm/tools/clang/lib/Driver/MSVCToolChain.cpp:245:33:<br>
error: ISO C++11 does not allow conversion from string literal to<br>
'char *' [-Werror,-Wwritable-strings]<br>
<span class=""> char *tests[] = {"winv6.3", "win8", "win7"};<br>
</span> ^<br>
/Users/buildbot/src/llvm-buildbot/slave/mac10.9-cmake/build/llvm/tools/clang/lib/Driver/MSVCToolChain.cpp:245:41:<br>
error: ISO C++11 does not allow conversion from string literal to<br>
'char *' [-Werror,-Wwritable-strings]<br>
<span class=""> char *tests[] = {"winv6.3", "win8", "win7"};<br>
</span> ^<br>
3 errors generated.<br>
<br>
Can you please take a look?<br>
<div class="HOEnZb"><div class="h5"><br>
On Wed, Oct 22, 2014 at 1:40 PM, Zachary Turner <<a href="mailto:zturner@google.com">zturner@google.com</a>> wrote:<br>
> Author: zturner<br>
> Date: Wed Oct 22 15:40:43 2014<br>
> New Revision: 220425<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=220425&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=220425&view=rev</a><br>
> Log:<br>
> Make a good guess about where MSVC and Windows SDK libraries are for linking.<br>
><br>
> When a user has not configured a standard Visual Studio environment<br>
> by running vcvarsall, clang tries its best to find Visual Studio<br>
> include files and executables anyway. This patch makes clang also<br>
> try to find system and Windows SDK libraries for linking against,<br>
> as well.<br>
><br>
> Reviewed by: Hans Wennborg<br>
> Differential Revision: <a href="http://reviews.llvm.org/D5873" target="_blank">http://reviews.llvm.org/D5873</a><br>
><br>
> Modified:<br>
> cfe/trunk/lib/Driver/MSVCToolChain.cpp<br>
> cfe/trunk/lib/Driver/ToolChains.h<br>
> cfe/trunk/lib/Driver/Tools.cpp<br>
><br>
> Modified: cfe/trunk/lib/Driver/MSVCToolChain.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MSVCToolChain.cpp?rev=220425&r1=220424&r2=220425&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/MSVCToolChain.cpp?rev=220425&r1=220424&r2=220425&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/MSVCToolChain.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/MSVCToolChain.cpp Wed Oct 22 15:40:43 2014<br>
> @@ -212,6 +212,71 @@ bool MSVCToolChain::getWindowsSDKDir(std<br>
> return hasSDKDir && !path.empty();<br>
> }<br>
><br>
> +// Gets the library path required to link against the Windows SDK.<br>
> +bool MSVCToolChain::getWindowsSDKLibraryPath(std::string &path) const {<br>
> + std::string sdkPath;<br>
> + int sdkMajor = 0;<br>
> + int sdkMinor = 0;<br>
> +<br>
> + path.clear();<br>
> + if (!getWindowsSDKDir(sdkPath, sdkMajor, sdkMinor))<br>
> + return false;<br>
> +<br>
> + llvm::SmallString<128> libPath(sdkPath);<br>
> + llvm::sys::path::append(libPath, "Lib");<br>
> + if (sdkMajor <= 7) {<br>
> + switch (getArch()) {<br>
> + // In Windows SDK 7.x, x86 libraries are directly in the Lib folder.<br>
> + case llvm::Triple::x86:<br>
> + break;<br>
> + case llvm::Triple::x86_64:<br>
> + llvm::sys::path::append(libPath, "x64");<br>
> + break;<br>
> + case llvm::Triple::arm:<br>
> + // It is not necessary to link against Windows SDK 7.x when targeting ARM.<br>
> + return false;<br>
> + default:<br>
> + return false;<br>
> + }<br>
> + } else {<br>
> + // Windows SDK 8.x installs libraries in a folder whose names depend on the<br>
> + // version of the OS you're targeting. By default choose the newest, which<br>
> + // usually corresponds to the version of the OS you've installed the SDK on.<br>
> + char *tests[] = {"winv6.3", "win8", "win7"};<br>
> + bool found = false;<br>
> + for (char *test : tests) {<br>
> + llvm::SmallString<128> testPath(libPath);<br>
> + llvm::sys::path::append(testPath, test);<br>
> + if (llvm::sys::fs::exists(testPath.c_str())) {<br>
> + libPath = testPath;<br>
> + found = true;<br>
> + break;<br>
> + }<br>
> + }<br>
> +<br>
> + if (!found)<br>
> + return false;<br>
> +<br>
> + llvm::sys::path::append(libPath, "um");<br>
> + switch (getArch()) {<br>
> + case llvm::Triple::x86:<br>
> + llvm::sys::path::append(libPath, "x86");<br>
> + break;<br>
> + case llvm::Triple::x86_64:<br>
> + llvm::sys::path::append(libPath, "x64");<br>
> + break;<br>
> + case llvm::Triple::arm:<br>
> + llvm::sys::path::append(libPath, "arm");<br>
> + break;<br>
> + default:<br>
> + return false;<br>
> + }<br>
> + }<br>
> +<br>
> + path = libPath.str();<br>
> + return true;<br>
> +}<br>
> +<br>
> // Get the location to use for Visual Studio binaries. The location priority<br>
> // is: %VCINSTALLDIR% > %PATH% > newest copy of Visual Studio installed on<br>
> // system (as reported by the registry).<br>
><br>
> Modified: cfe/trunk/lib/Driver/ToolChains.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.h?rev=220425&r1=220424&r2=220425&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.h?rev=220425&r1=220424&r2=220425&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/ToolChains.h (original)<br>
> +++ cfe/trunk/lib/Driver/ToolChains.h Wed Oct 22 15:40:43 2014<br>
> @@ -746,6 +746,7 @@ public:<br>
> llvm::opt::ArgStringList &CC1Args) const override;<br>
><br>
> bool getWindowsSDKDir(std::string &path, int &major, int &minor) const;<br>
> + bool getWindowsSDKLibraryPath(std::string &path) const;<br>
> bool getVisualStudioInstallDir(std::string &path) const;<br>
> bool getVisualStudioBinariesFolder(const char *clangProgramPath,<br>
> std::string &path) const;<br>
><br>
> Modified: cfe/trunk/lib/Driver/Tools.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=220425&r1=220424&r2=220425&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=220425&r1=220424&r2=220425&view=diff</a><br>
> ==============================================================================<br>
> --- cfe/trunk/lib/Driver/Tools.cpp (original)<br>
> +++ cfe/trunk/lib/Driver/Tools.cpp Wed Oct 22 15:40:43 2014<br>
> @@ -7854,6 +7854,39 @@ void visualstudio::Link::ConstructJob(Co<br>
> CmdArgs.push_back("-defaultlib:libcmt");<br>
> }<br>
><br>
> + if (!llvm::sys::Process::GetEnv("LIB")) {<br>
> + // If the VC environment hasn't been configured (perhaps because the user<br>
> + // did not run vcvarsall), try to build a consistent link environment. If<br>
> + // the environment variable is set however, assume the user knows what he's<br>
> + // doing.<br>
> + std::string VisualStudioDir;<br>
> + const auto &MSVC = static_cast<const toolchains::MSVCToolChain &>(getToolChain());<br>
> + if (MSVC.getVisualStudioInstallDir(VisualStudioDir)) {<br>
> + SmallString<128> LibDir(VisualStudioDir);<br>
> + llvm::sys::path::append(LibDir, "VC", "lib");<br>
> + switch (MSVC.getArch()) {<br>
> + case llvm::Triple::x86:<br>
> + // x86 just puts the libraries directly in lib<br>
> + break;<br>
> + case llvm::Triple::x86_64:<br>
> + llvm::sys::path::append(LibDir, "amd64");<br>
> + break;<br>
> + case llvm::Triple::arm:<br>
> + llvm::sys::path::append(LibDir, "arm");<br>
> + break;<br>
> + default:<br>
> + break;<br>
> + }<br>
> + CmdArgs.push_back(<br>
> + Args.MakeArgString(std::string("-libpath:") + LibDir.c_str()));<br>
> + }<br>
> +<br>
> + std::string WindowsSdkLibPath;<br>
> + if (MSVC.getWindowsSDKLibraryPath(WindowsSdkLibPath))<br>
> + CmdArgs.push_back(Args.MakeArgString(std::string("-libpath:") +<br>
> + WindowsSdkLibPath.c_str()));<br>
> + }<br>
> +<br>
> CmdArgs.push_back("-nologo");<br>
><br>
> if (Args.hasArg(options::OPT_g_Group)) {<br>
><br>
><br>
> _______________________________________________<br>
> cfe-commits mailing list<br>
> <a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
<br>
<br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Alexander Potapenko<br>
Software Engineer<br>
Google Moscow<br>
</font></span></blockquote></div><br></div>