28 lines
1 KiB
Text
28 lines
1 KiB
Text
Respect LDFLAGS, see upstream PR
|
|
https://github.com/ocaml/ocaml/pull/10091
|
|
|
|
Index: Makefile.config.in
|
|
--- Makefile.config.in.orig
|
|
+++ Makefile.config.in
|
|
@@ -76,6 +76,8 @@ AS_HAS_DEBUG_PREFIX_MAP=@as_has_debug_prefix_map@
|
|
# our own symbols):
|
|
OC_LDFLAGS=@oc_ldflags@
|
|
|
|
+LDFLAGS?=@LDFLAGS@
|
|
+
|
|
### How to invoke the C preprocessor through the C compiler
|
|
CPP=@CPP@
|
|
|
|
@@ -249,9 +251,10 @@ ifeq "$(TOOLCHAIN)" "msvc"
|
|
|| mt -nologo -outputresource:$(1) -manifest $(1).manifest \
|
|
&& rm -f $(1).manifest
|
|
MKEXE_BOOT=$(CC) $(OC_CFLAGS) $(CFLAGS) $(OUTPUTEXE)$(1) $(2) \
|
|
- /link /subsystem:console $(OC_LDFLAGS) && ($(MERGEMANIFESTEXE))
|
|
+ /link /subsystem:console $(OC_LDFLAGS) $(LDFLAGS) && ($(MERGEMANIFESTEXE))
|
|
else
|
|
- MKEXE_BOOT=$(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_LDFLAGS) $(OUTPUTEXE)$(1) $(2)
|
|
+ MKEXE_BOOT=$(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_LDFLAGS) $(LDFLAGS) \
|
|
+ $(OUTPUTEXE)$(1) $(2)
|
|
endif # ifeq "$(TOOLCHAIN)" "msvc"
|
|
|
|
# The following variables were defined only in the Windows-specific makefiles.
|