This is an archive of the discontinued LLVM Phabricator instance.

Driver: Add gcc search path for RHEL devtoolset-7
ClosedPublic

Authored by tstellar on Mar 5 2018, 6:02 PM.

Reviewers

Commits

LGTM

This revision is now accepted and ready to land.Mar 23 2018, 4:46 PM

This revision was automatically updated to reflect the committed changes.

Path

Size

cfe/

trunk/

lib/

Driver/

ToolChains/

1 line

Show First 20 Lines • Show All 1,779 Lines • ▼ Show 20 Lines	for (vfs::directory_iterator LI = D.getVFS().dir_begin(PrefixDir, EC), LE;
Prefixes.push_back(CandidatePrefix);		Prefixes.push_back(CandidatePrefix);
}		}
return;		return;
}		}

// Non-Solaris is much simpler - most systems just go with "/usr".		// Non-Solaris is much simpler - most systems just go with "/usr".
if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {		if (SysRoot.empty() && TargetTriple.getOS() == llvm::Triple::Linux) {
// Yet, still look for RHEL devtoolsets.		// Yet, still look for RHEL devtoolsets.
		Prefixes.push_back("/opt/rh/devtoolset-7/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-6/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-6/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-4/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-4/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-3/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-3/root/usr");
Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");		Prefixes.push_back("/opt/rh/devtoolset-2/root/usr");
}		}
Prefixes.push_back(SysRoot.str() + "/usr");		Prefixes.push_back(SysRoot.str() + "/usr");
}		}

▲ Show 20 Lines • Show All 727 Lines • Show Last 20 Lines