SHA256
1
0
forked from pool/llvm
llvm/llvm-fix-find-gcc5-install.patch

20 lines
911 B
Diff

Index: cfe-3.6.0.src/lib/Driver/ToolChains.cpp
===================================================================
--- cfe-3.6.0.src/lib/Driver/ToolChains.cpp.orig 2015-02-20 14:03:49.512242844 +0100
+++ cfe-3.6.0.src/lib/Driver/ToolChains.cpp 2015-02-20 15:07:11.965048162 +0100
@@ -1135,10 +1135,11 @@ Generic_GCC::GCCVersion Linux::GCCVersio
GoodVersion.Major < 0)
return BadVersion;
GoodVersion.MajorStr = First.first.str();
- if (Second.first.getAsInteger(10, GoodVersion.Minor) ||
- GoodVersion.Minor < 0)
- return BadVersion;
GoodVersion.MinorStr = Second.first.str();
+ if (!Second.first.str().empty () &&
+ (Second.first.getAsInteger(10, GoodVersion.Minor) ||
+ GoodVersion.Minor < 0))
+ return BadVersion;
// First look for a number prefix and parse that if present. Otherwise just
// stash the entire patch string in the suffix, and leave the number