forked from pool/supermin
37af610807
* Add support for OCaml 5 * Add kylinsecos support * rpm: Detect dnf5 and omit missing options * ocamlc: Use -output-complete-exe instead of -custom * Fix kernel filtering for aarch64 architecture * Uncompress kernel on RISC-V - Drop patches contained in new tarball 001-Improved-debugging-of-the-supermin-if-newer-calculation.patch 002-Fix-if-newer-copy-kernel.patch 003-Fix-kernel-filtering-for-aarch64-architecture.patch 004-Use-output-complete-exe-instead-of-custom.patch 005-Only-supply-output-complete-exe-to-final-link.patch 006-Rename-function-file-kernel.patch 007-Uncompress-kernel-on-RISC-V.patch 008-Fix-link-to-renamed-kernel-documentation.patch 009-New-mailing-list-email-address.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/supermin?expand=0&rev=90
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
Subject: ocamlc: Only supply -output-complete-exe to final link
|
|
From: Richard W.M. Jones rjones@redhat.com Wed Jul 12 22:51:43 2023 +0100
|
|
Date: Wed Jul 12 22:51:43 2023 +0100:
|
|
Git: 59a8ffc40db94a38879d9c923520e0bd70ffa271
|
|
|
|
Add a separate variable to store link flags, and use that to supply
|
|
-output-complete-exe. Apparently ocamlc ignores -custom in the wrong
|
|
place.
|
|
|
|
Fixes: dc80dbbef60d5d81a7d4321683a8c7305dc04972
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index 5a1c671..1268aa5 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -132,8 +132,8 @@ OCAMLFLAGS = -g -warn-error +C+D+E+F+L+M+P+S+U+V+X+Y+Z-3
|
|
if !HAVE_OCAMLOPT
|
|
OBJECTS = $(BOBJECTS)
|
|
BEST = c
|
|
-#OCAMLFLAGS += -custom # for OCaml < 4.10
|
|
-OCAMLFLAGS += -output-complete-exe
|
|
+#OCAMLLINKFLAGS = -custom # for OCaml < 4.10
|
|
+OCAMLLINKFLAGS = -output-complete-exe
|
|
else
|
|
OBJECTS = $(XOBJECTS)
|
|
BEST = opt
|
|
@@ -143,7 +143,8 @@ supermin_DEPENDENCIES = $(OBJECTS)
|
|
|
|
supermin_LINK = \
|
|
./supermin-link.sh \
|
|
- $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) \
|
|
+ $(OCAMLFIND) $(BEST) $(OCAMLLINKFLAGS) $(OCAMLFLAGS) \
|
|
+ $(OCAMLPACKAGES) \
|
|
$(OBJECTS) -o $@
|
|
|
|
.mli.cmi:
|