mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 20:33:38 +00:00
makefiles: Stop creating importlib symlinks.
We always pass the full path to winegcc. Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
986254d6c1
commit
e694c798b6
|
@ -2005,24 +2005,6 @@ static int needs_delay_lib( const struct makefile *make )
|
|||
}
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
* needs_implib_symlink
|
||||
*/
|
||||
static int needs_implib_symlink( const struct makefile *make )
|
||||
{
|
||||
if (!make->module) return 0;
|
||||
if (!make->importlib) return 0;
|
||||
if (make->is_win16 && make->disabled) return 0;
|
||||
if (strncmp( make->obj_dir, "dlls/", 5 )) return 0;
|
||||
if (!strcmp( make->module, make->importlib )) return 0;
|
||||
if (!strchr( make->importlib, '.' ) &&
|
||||
!strncmp( make->module, make->importlib, strlen( make->importlib )) &&
|
||||
!strcmp( make->module + strlen( make->importlib ), ".dll" ))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
* add_unix_libraries
|
||||
*/
|
||||
|
@ -2185,8 +2167,6 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
|
|||
if (ext) lib = replace_extension( lib, ".a", ext );
|
||||
strarray_add_uniq( deps, lib );
|
||||
strarray_add( &ret, lib );
|
||||
if (needs_implib_symlink( submakes[j] ))
|
||||
strarray_add_uniq( deps, strmake( "dlls/lib%s%s", name, ext ? ext : ".a" ));
|
||||
}
|
||||
else strarray_add( &ret, strmake( "-l%s", name ));
|
||||
}
|
||||
|
@ -2554,27 +2534,6 @@ static void output_uninstall_rules( struct makefile *make )
|
|||
}
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
* output_importlib_symlinks
|
||||
*/
|
||||
static struct strarray output_importlib_symlinks( const struct makefile *make )
|
||||
{
|
||||
struct strarray ret = empty_strarray;
|
||||
const char *lib, *dst, *ext[2] = { "a", "cross.a" };
|
||||
int i, count = 1 + !!crosstarget;
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
lib = strmake( "lib%s.%s", make->importlib, ext[i] );
|
||||
dst = strmake( "dlls/%s", lib );
|
||||
output( "%s: %s\n", dst, obj_dir_path( make, lib ));
|
||||
output_symlink_rule( concat_paths( make->obj_dir + strlen("dlls/"), lib ), dst, 0 );
|
||||
strarray_add( &ret, dst );
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*******************************************************************
|
||||
* output_po_files
|
||||
*/
|
||||
|
@ -3336,8 +3295,6 @@ static void output_import_lib( struct makefile *make )
|
|||
strmake( "lib%s.cross.a", make->importlib ),
|
||||
strmake( "d%s/lib%s.a", pe_dir, make->importlib ));
|
||||
}
|
||||
if (needs_implib_symlink( make ))
|
||||
strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make ));
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue