From 828a873df2b838e46faa5700dbae18601cb8dcb9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 14 Jan 2021 12:20:03 +0000
Subject: [PATCH] Build ocamlrpcgen as native code.

---
 code/src/rpc-generator/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/code/src/rpc-generator/Makefile b/code/src/rpc-generator/Makefile
index e0ed4f5..a475e83 100644
--- a/code/src/rpc-generator/Makefile
+++ b/code/src/rpc-generator/Makefile
@@ -6,9 +6,11 @@ PKGNAME  = rpc-generator
 ARCHIVE  = rpc_generator
 OBJECTS  = config.cmo syntax.cmo options.cmo parser.cmo lexer.cmo rename.cmo \
            generate.cmo direct.cmo
+XOBJECTS = config.cmx syntax.cmx options.cmx parser.cmx lexer.cmx rename.cmx \
+           generate.cmx direct.cmx
 DOBJECTS = 
 
-ALL_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
+OPT_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
 
 PACKLIST = rpcgen-packlist
 
@@ -21,12 +23,12 @@ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
 
 include $(TOP_DIR)/Makefile.rules
 
-ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cma main.cmo
+ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cmxa main.cmx
 	rm -f ocamlrpcgen ocamlrpcgen$(EXEC_SUFFIX)
 	OCAMLPATH="..$(PATH_SEP)$$OCAMLPATH" \
-	$(OCAMLC) -custom -o ocamlrpcgen \
+	$(OCAMLOPT) -o ocamlrpcgen \
 		-package unix,netstring,$(REGEXP_PROVIDER) \
-		$(ARCHIVE).cma main.cmo -linkpkg
+		$(ARCHIVE).cmxa main.cmx -linkpkg
 
 rpcgen-packlist:
 	echo $(BINDIR)/ocamlrpcgen >rpcgen-packlist
-- 
2.28.0.rc2