From f70de87e8444b8783446768ba2b6669c858bf50f Mon Sep 17 00:00:00 2001 From: Robert Norton Date: Fri, 24 May 2019 11:18:51 +0100 Subject: Attempt to fix opam build with opam2: use a .install file and don't rely on opam being in path to get SAIL_DIR (which seems to be unreliable). --- opam | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'opam') diff --git a/opam b/opam index dc44622..8fa83af 100644 --- a/opam +++ b/opam @@ -17,14 +17,11 @@ homepage: "https://github.com/rems-project/sail-riscv/" bug-reports: "https://github.com/rems-project/sail-riscv/issues" license: "BSD3" dev-repo: "https://github.com/rems-project/sail-riscv.git" -build: [make "INSTALL_DIR=%{prefix}%" "opam-build"] -install: [make "INSTALL_DIR=%{prefix}%" "opam-install"] -remove: [ - make "INSTALL_DIR=%{prefix}%" "opam-uninstall" -] +build: [make "LEM_DIR=%{lem:share}%" "SAIL_DIR=%{sail:share}%" "SAIL=sail" "opam-build"] depends: [ "ocamlfind" "ocamlbuild" + "lem" "sail" {>= "0.9"} "linksem" {>= "0.3"} "conf-gmp" -- cgit v1.1