Alexandre Julliard : makefiles: Stop creating importlib symlinks.
Alexandre Julliard
julliard at winehq.org
Mon Nov 22 16:05:16 CST 2021
Module: wine
Branch: master
Commit: e694c798b60780aef891edfa23268bb897017561
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e694c798b60780aef891edfa23268bb897017561
Author: Alexandre Julliard <julliard at winehq.org>
Date: Sat Nov 20 13:03:53 2021 +0100
makefiles: Stop creating importlib symlinks.
We always pass the full path to winegcc.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/makedep.c | 43 -------------------------------------------
1 file changed, 43 deletions(-)
diff --git a/tools/makedep.c b/tools/makedep.c
index 2de02aab411..99f824d5f8b 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -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 ));
}
More information about the wine-cvs
mailing list