Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix GCC detection in RBuild (first check TARGET_CC).

Browse source 
svn path=/trunk/; revision=43040
This commit is contained in:
Dmitry Gorbachev 2009-09-13 21:18:21 +00:00
parent 739a12f946
commit 92b08a01ef
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/tools/rbuild/backend/mingw/mingw.cpp
View file

@ -740,13 +740,25 @@ MingwBackend::DetectCompiler ()
if ( ProjectNode.configuration.Compiler == GnuGcc ) if ( ProjectNode.configuration.Compiler == GnuGcc )
{ {
const string& TARGET_CCValue = Environment::GetVariable ( "TARGET_CC" );
const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" ); const string& ROS_PREFIXValue = Environment::GetVariable ( "ROS_PREFIX" );
if ( ROS_PREFIXValue.length () > 0 ) if ( ROS_PREFIXValue.length () > 0 )
{ {
compilerPrefix = ROS_PREFIXValue; compilerPrefix = "";
compilerCommand = compilerPrefix + "-gcc"; compilerCommand = TARGET_CCValue;
detectedCompiler = TryToDetectThisCompiler ( compilerCommand ); detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
} }
if ( !detectedCompiler )
{
if ( ROS_PREFIXValue.length () > 0 )
{
compilerPrefix = ROS_PREFIXValue;
compilerCommand = compilerPrefix + "-gcc";
detectedCompiler = TryToDetectThisCompiler ( compilerCommand );
}
}
#if defined(WIN32) #if defined(WIN32)
if ( !detectedCompiler ) if ( !detectedCompiler )
{ {