Do not put .h files in object files, it causes problems at link time

svn path=/trunk/; revision=29176
This commit is contained in:
Hervé Poussineau 2007-09-24 11:00:17 +00:00
parent c27dad3928
commit 5dc2b7e865

View file

@ -500,7 +500,7 @@ MingwModuleHandler::GetObjectFilename (
else if ( module.type == RpcClient ) else if ( module.type == RpcClient )
newExtension = "_c.o"; newExtension = "_c.o";
else else
newExtension = ".h"; return NULL;
} }
else else
newExtension = ".o"; newExtension = ".o";
@ -913,11 +913,13 @@ MingwModuleHandler::GenerateObjectMacros (
CompilationUnit& compilationUnit = *compilationUnits[i]; CompilationUnit& compilationUnit = *compilationUnits[i];
if ( !compilationUnit.IsFirstFile () ) if ( !compilationUnit.IsFirstFile () )
{ {
const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL );
if ( objectFilename )
fprintf ( fprintf (
fMakefile, fMakefile,
"%s%s", "%s%s",
( i%10 == 9 ? " \\\n\t" : " " ), ( i%10 == 9 ? " \\\n\t" : " " ),
backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str () ); backend->GetFullName ( *objectFilename ).c_str () );
} }
} }
fprintf ( fMakefile, "\n" ); fprintf ( fMakefile, "\n" );