Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-23 02:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Generating relocations twice for DLLs? Oh, what a clever idea ... not.

Browse source 
svn path=/trunk/; revision=16449
This commit is contained in:
Filip Navara 2005-07-06 08:43:36 +00:00
parent 8e4e06d0de
commit b6e80ebb53
1 changed files with 1 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
View file

@ -1341,40 +1341,17 @@ MingwModuleHandler::GenerateLinkerCommand (
if ( module.IsDLL () ) if ( module.IsDLL () )
{ {
string base_tmp = ros_temp + module.name + ".base.tmp";
CLEAN_FILE ( base_tmp );
string junk_tmp = ros_temp + module.name + ".junk.tmp";
CLEAN_FILE ( junk_tmp );
string temp_exp = ros_temp + module.name + ".temp.exp"; string temp_exp = ros_temp + module.name + ".temp.exp";
CLEAN_FILE ( temp_exp ); CLEAN_FILE ( temp_exp );
fprintf ( fMakefile,
"\t%s %s -Wl,--base-file,%s -o %s %s %s %s\n",
linker.c_str (),
linkerParameters.c_str (),
base_tmp.c_str (),
junk_tmp.c_str (),
objectsMacro.c_str (),
libsMacro.c_str (),
GetLinkerMacro ().c_str () );
fprintf ( fMakefile,
"\t-@${rm} %s 2>$(NUL)\n",
junk_tmp.c_str () );
string killAt = module.mangledSymbols ? "" : "--kill-at"; string killAt = module.mangledSymbols ? "" : "--kill-at";
fprintf ( fMakefile, fprintf ( fMakefile,
"\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s %s\n", "\t${dlltool} --dllname %s --def %s --output-exp %s %s\n",
targetName.c_str (), targetName.c_str (),
base_tmp.c_str (),
def_file.c_str (), def_file.c_str (),
temp_exp.c_str (), temp_exp.c_str (),
killAt.c_str () ); killAt.c_str () );
fprintf ( fMakefile,
"\t-@${rm} %s 2>$(NUL)\n",
base_tmp.c_str () );
fprintf ( fMakefile, fprintf ( fMakefile,
"\t%s %s %s -o %s %s %s %s\n", "\t%s %s %s -o %s %s %s %s\n",
linker.c_str (), linker.c_str (),