Alexandre Julliard : makefiles: Support per-platform values for EXTRADLLFLAGS.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Dec  2 09:59:49 2021 +0100

makefiles: Support per-platform values for EXTRADLLFLAGS.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/ntdll/Makefile.in | 1 +
 tools/makedep.c        | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 7e823208840..185bc563e68 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -7,6 +7,7 @@ EXTRAINCL = $(UNWIND_CFLAGS)
 EXTRALIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
 
 EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
+x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000
 
 C_SRCS = \
 	actctx.c \
diff --git a/tools/makedep.c b/tools/makedep.c
index 2301ecf191e..e69dc3ce0a4 100644
--- a/tools/makedep.c
+++ b/tools/makedep.c
@@ -4131,6 +4131,12 @@ static void load_sources( struct makefile *make )
     if (make->extlib) make->staticlib = make->extlib;
     if (make->staticlib) make->module = make->staticlib;
 
+    if (host_cpu)
+    {
+        value = get_expanded_file_local_var( make, host_cpu, "EXTRADLLFLAGS" );
+        if (value.count) make->extradllflags = value;
+    }
+
     make->disabled   = make->obj_dir && strarray_exists( &disabled_dirs, make->obj_dir );
     make->is_win16   = strarray_exists( &make->extradllflags, "-m16" );
     make->use_msvcrt = (make->module || make->testdll || make->is_win16) &&