Alexandre Julliard : makefiles: Use a separate LDFLAGS variable for cross-compilation.

Alexandre Julliard julliard at winehq.org
Thu May 2 16:45:08 CDT 2019


Module: wine
Branch: master
Commit: 5d1febc9094673b93c1672e55e761c3c265e901b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=5d1febc9094673b93c1672e55e761c3c265e901b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu May  2 15:59:23 2019 +0200

makefiles: Use a separate LDFLAGS variable for cross-compilation.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 tools/makedep.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/makedep.c b/tools/makedep.c
index d909b31..091ad2b 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -2957,6 +2957,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source,
     output_filename( source->filename );
     output_filename( obj_name );
     output_filenames( all_libs );
+    output_filename( crosstarget ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );
     output( "\n" );
 }
 
@@ -3182,6 +3183,7 @@ static void output_module( struct makefile *make )
     output_filenames_obj_dir( make, need_cross ? make->crossobj_files : make->object_files );
     output_filenames_obj_dir( make, make->res_files );
     output_filenames( all_libs );
+    output_filename( need_cross ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );
     output( "\n" );
 
     if (spec_file && make->importlib)
@@ -3340,6 +3342,7 @@ static void output_test_module( struct makefile *make )
     output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files );
     output_filenames_obj_dir( make, make->res_files );
     output_filenames( all_libs );
+    output_filename( crosstarget ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );
     output( "\n" );
     output( "%s%s:\n", obj_dir_path( make, stripped ), ext );
     output_winegcc_command( make, !!crosstarget );
@@ -3349,6 +3352,7 @@ static void output_test_module( struct makefile *make )
     output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files );
     output_filenames_obj_dir( make, make->res_files );
     output_filenames( all_libs );
+    output_filename( crosstarget ? "$(CROSSLDFLAGS)" : "$(LDFLAGS)" );
     output( "\n" );
     output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext );
     output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files );




More information about the wine-cvs mailing list