mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-03 04:13:31 +00:00
Fix GCC detection in RBuild (first check TARGET_CC).
svn path=/trunk/; revision=43040
This commit is contained in:
@@ -740,13 +740,25 @@ MingwBackend::DetectCompiler ()
|
||||
|
||||
if ( ProjectNode.configuration.Compiler == GnuGcc )
|
||||
{
|
||||
const string& TARGET_CCValue = Environment::GetVariable ( "TARGET_CC" );
|
||||
const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
|
||||
|
||||
if ( ROS_PREFIXValue.length () > 0 )
|
||||
{
|
||||
compilerPrefix = ROS_PREFIXValue;
|
||||
compilerCommand = compilerPrefix + "-gcc";
|
||||
compilerPrefix = "";
|
||||
compilerCommand = TARGET_CCValue;
|
||||
detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
|
||||
}
|
||||
|
||||
if ( !detectedCompiler )
|
||||
{
|
||||
if ( ROS_PREFIXValue.length () > 0 )
|
||||
{
|
||||
compilerPrefix = ROS_PREFIXValue;
|
||||
compilerCommand = compilerPrefix + "-gcc";
|
||||
detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
|
||||
}
|
||||
}
|
||||
#if defined(WIN32)
|
||||
if ( !detectedCompiler )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user