Skip to content

Commit

Permalink
Fix opam warning
Browse files Browse the repository at this point in the history
Replace `opam config var` with `opam var` as recommended endlessly by OPAM.
  • Loading branch information
Timmmm committed Oct 10, 2023
1 parent 24e3e68 commit a10e42a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@ export SAIL_DIR
EXPLICIT_COQ_SAIL=yes
else
# Use sail from opam package
SAIL_DIR:=$(shell opam config var sail:share)
SAIL_DIR:=$(shell opam var sail:share)
SAIL:=sail
endif
SAIL_LIB_DIR:=$(SAIL_DIR)/lib
export SAIL_LIB_DIR
SAIL_SRC_DIR:=$(SAIL_DIR)/src

LEM_DIR?=$(shell opam config var lem:share)
LEM_DIR?=$(shell opam var lem:share)
export LEM_DIR

C_WARNINGS ?=
Expand Down Expand Up @@ -353,15 +353,15 @@ riscv_hol_build: generated_definitions/hol4/$(ARCH)/riscvTheory.uo
ifdef BBV_DIR
EXPLICIT_COQ_BBV = yes
else
EXPLICIT_COQ_BBV = $(shell if opam config var coq-bbv:share >/dev/null 2>/dev/null; then echo no; else echo yes; fi)
EXPLICIT_COQ_BBV = $(shell if opam var coq-bbv:share >/dev/null 2>/dev/null; then echo no; else echo yes; fi)
ifeq ($(EXPLICIT_COQ_BBV),yes)
#Coq BBV library hopefully checked out in directory above us
BBV_DIR = ../bbv
endif
endif

ifndef EXPLICIT_COQ_SAIL
EXPLICIT_COQ_SAIL = $(shell if opam config var coq-sail:share >/dev/null 2>/dev/null; then echo no; else echo yes; fi)
EXPLICIT_COQ_SAIL = $(shell if opam var coq-sail:share >/dev/null 2>/dev/null; then echo no; else echo yes; fi)
endif

COQ_LIBS = -R generated_definitions/coq Riscv -R generated_definitions/coq/$(ARCH) $(ARCH) -R handwritten_support Riscv_common
Expand Down
2 changes: 1 addition & 1 deletion prover_snapshots/coq/lib/sail/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HAVE_OPAM_BBV=$(shell if opam config var coq-bbv:share >/dev/null 2>/dev/null; then echo yes; else echo no; fi)
HAVE_OPAM_BBV=$(shell if opam var coq-bbv:share >/dev/null 2>/dev/null; then echo yes; else echo no; fi)

ifeq ($(HAVE_OPAM_BBV),no)
BBV_DIR?=../../../bbv/src/bbv
Expand Down
2 changes: 1 addition & 1 deletion prover_snapshots/hol4/lib/sail/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LEM_DIR?=$(shell opam config var lem:share)
LEM_DIR?=$(shell opam var lem:share)

LEMSRC = \
../../src/gen_lib/sail2_instr_kinds.lem \
Expand Down

0 comments on commit a10e42a

Please sign in to comment.