erlang: fix default builds on some platforms (HiPE is gone)

The Erlang 24 release removed the HiPE module. Un-break builds where
the erlang-hipe option was (often default) enabled.

2 files changed, 2 insertions, 230 deletions

diff --git a/lang/erlang/PLIST.hipe b/lang/erlang/PLIST.hipe
deleted file mode 100644
index ba4f10e357d..00000000000
--- a/lang/erlang/PLIST.hipe
+++ /dev/null
@@ -1,209 +0,0 @@
-@comment $NetBSD: PLIST.hipe,v 1.10 2021/02/20 01:02:29 gutteridge Exp $
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/elf_format.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_adj_list.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_sse2_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific_sse2.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_spill_restore.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_sse2.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_liveness_gpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb_weights.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_coalescing_regalloc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_data_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_graph_coloring_regalloc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode2rtl.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_heap_test.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig_moves.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_jit.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_merge.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ls_regalloc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_moves.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_node_sets.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_optimistic_regalloc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_pack_constants.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_all.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_fpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_gpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_postconditions_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_specific_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_profile.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_range_split.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_reg_worklists.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_regalloc_loop.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_regalloc_prepass.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_restore_reuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arch.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arith_32.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arith_64.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary_construct.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary_match.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_cleanup_const.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_exceptions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_lcm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_mk_switch.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_primops.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa_avail_expr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa_const_prop.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssapre.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_symbolic.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_amd64.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_arm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_llvm.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_ppc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_sparc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_x86.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_varmap.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_verify_gcsafe.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sdi.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_segment_trees.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_all.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_fpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_gpr.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_postconditions_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_specific_fp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillcost.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_color.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_scan.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_tagscheme.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_temp_map.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_vectors.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_assemble.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_cfg.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_defuse.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_encode.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_frame.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_liveness.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_main.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_postpass.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_pp.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_finalise.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_ls.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_naive.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_postconditions.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_registers.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_spill_restore.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_subst.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_x87.beam
-lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_heap_test.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf32_format.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf64_format.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_arch.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_liveness.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_main.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_merge.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_rtl_to_llvm.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_data_pp.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_pack_constants.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_segment_trees.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_icode2rtl.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_literals.hrl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arch.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arith_32.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arith_64.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary_construct.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary_match.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_cfg.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_cleanup_const.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_exceptions.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_lcm.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_liveness.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_mk_switch.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_primops.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa_avail_expr.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa_const_prop.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssapre.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_symbolic.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_varmap.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_verify_gcsafe.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_tagscheme.erl
-lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_vectors.erl
diff --git a/lang/erlang/options.mk b/lang/erlang/options.mk
index bca775a3036..027482314bc 100644
--- a/lang/erlang/options.mk
+++ b/lang/erlang/options.mk
@@ -1,20 +1,11 @@
-# $NetBSD: options.mk,v 1.14 2022/10/15 18:04:10 triaxx Exp $
+# $NetBSD: options.mk,v 1.15 2022/10/17 01:47:17 gutteridge Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.erlang
-PKG_SUPPORTED_OPTIONS=		java erlang-hipe
+PKG_SUPPORTED_OPTIONS=		java
 PKG_OPTIONS_OPTIONAL_GROUPS=	odbc
 PKG_OPTIONS_GROUP.odbc=		iodbc unixodbc
 
 PKG_SUGGESTED_OPTIONS=	# empty
-###
-### Activate HiPE by default on some systems or if the user has
-### defined the erlang-hipe option in mk.conf
-###
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") &&	\
-    (${OPSYS} == "FreeBSD" || ${OPSYS} == "Linux" ||			\
-     ${OPSYS} == "NetBSD"  || ${OPSYS} == "OpenBSD" || ${OPSYS} == "SunOS")
-PKG_SUGGESTED_OPTIONS+=	erlang-hipe
-.endif
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD" || \
     ${OPSYS} == "Linux"
@@ -35,16 +26,6 @@ PLIST_SRC+=		PLIST.java
 CONFIGURE_ARGS+=	--without-javac
 .endif
 
-# Some hipe-related files are still installed even when --disable-hipe
-# is supplied, and these should remain in the general PLIST.
-.if !empty(PKG_OPTIONS:Merlang-hipe)
-CONFIGURE_ARGS+=	--enable-hipe
-PLIST_SRC+=		PLIST.hipe
-USE_TOOLS+=		gm4	# needs -P
-.else
-CONFIGURE_ARGS+=	--disable-hipe
-.endif
-
 ###
 ### Provide iodbc/unixodbc option support
 ###