mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

Bug 503153.Fixed NPE in GCCToolChain.getDefaultScannerInfo()

Browse source 
Change-Id: I51c4d4c2e517fc5743b180c99212dc9c3b8134ed
Signed-off-by: Christian Sell <c.sell@byterefinery.de>
(cherry picked from commit e0c3180f80)
This commit is contained in:
Christian Sell 2016-12-12 18:13:48 +01:00 • committed by Doug Schaefer
parent 0b024e9e3e
commit 7f9171cd74
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
build/org.eclipse.cdt.build.gcc.core/src/org/eclipse/cdt/build/gcc/core/internal/GCCPathToolChainProvider.java
View file

@ -30,7 +30,8 @@ public class GCCPathToolChainProvider implements IToolChainProvider {
private static final String ID = "org.eclipse.cdt.build.gcc.core.gccPathProvider"; //$NON-NLS-1$
private static final Pattern gccPattern = Pattern.compile("(.*-)?(gcc|g\\+\\+|clang|clang\\+\\+)"); //$NON-NLS-1$
private static final Pattern gppPattern = Pattern.compile("(.*-)?(g\\+\\+|clang\\+\\+)"); //$NON-NLS-1$
private static final Pattern gccPattern = Pattern.compile("(.*-)?(gcc|clang)"); //$NON-NLS-1$
private static final Pattern versionPattern = Pattern.compile(".*(gcc|LLVM) version .*"); //$NON-NLS-1$
private static final Pattern targetPattern = Pattern.compile("Target: (.*)"); //$NON-NLS-1$
@ -48,9 +49,28 @@ public class GCCPathToolChainProvider implements IToolChainProvider {
File dir = new File(dirStr);
if (dir.isDirectory()) {
for (String file : dir.list()) {
String prefix = null;
boolean hasAltCmd = false;
Matcher matcher = gccPattern.matcher(file);
if (matcher.matches()) {
String prefix = matcher.group(1);
prefix = matcher.group(1);
String cmd = matcher.group(2);
String altFile = prefix + (cmd.startsWith("g") ? "g++" : "clang++");
File altCmd = new File(dir, altFile);
hasAltCmd = altCmd.exists() && altCmd.canExecute();
}
else {
matcher = gppPattern.matcher(file);
if (matcher.matches()) {
prefix = matcher.group(1);
String cmd = matcher.group(2);
String altFile = prefix + (cmd.startsWith("g") ? "gcc" : "clang");
File altCmd = new File(dir, altFile);
hasAltCmd = altCmd.exists() && altCmd.canExecute();
}
}
if (prefix != null && hasAltCmd) {
String command = dirStr + File.separatorChar + file;
try {
Process proc = new ProcessBuilder(new String[] { command, "-v" }).redirectErrorStream(true) //$NON-NLS-1$