From d67a977f7198865bb52d39fef8c16d817b04c0a7 Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Thu, 1 Jul 2021 03:30:20 -0700
Subject: [PATCH] [sledge] Use opam var instead of opam config var

Summary: Opam 2.1 will drop support for `opam config`.

Reviewed By: ngorogiannis

Differential Revision: D29441158

fbshipit-source-id: 2a5152313
---
 sledge/Makefile       | 4 ++--
 sledge/model/Makefile | 2 +-
 sledge/test/Makefile  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sledge/Makefile b/sledge/Makefile
index 2ecc6ee9c..125129c0a 100644
--- a/sledge/Makefile
+++ b/sledge/Makefile
@@ -33,11 +33,11 @@ LLVM_OCAML_SENTINEL=vendor/llvm-dune/src/llvm/common/dune
 # libLLVM.dylib.
 link_llvm_dylib:
 	@set -e ;\
-	LLVMLIB=$$($$(opam config var conf-llvm:config) --libdir) ;\
+	LLVMLIB=$$($$(opam var conf-llvm:config) --libdir) ;\
 	ln -s $$LLVMLIB/libLLVM.dylib $$LLVMLIB/libLLVM-11.dylib
 
 $(LLVM_OCAML_SENTINEL): $(LLVM_OCAML_SRC)
-	cd vendor/llvm-dune; ./setup.sh $$(opam config var conf-llvm:config) &>/dev/null
+	cd vendor/llvm-dune; ./setup.sh $$(opam var conf-llvm:config) # &>/dev/null
 
 clean_llvm:
 	rm -rf vendor/llvm-dune/{src,llvm_*.opam}
diff --git a/sledge/model/Makefile b/sledge/model/Makefile
index 100618fa8..25a7278cb 100644
--- a/sledge/model/Makefile
+++ b/sledge/model/Makefile
@@ -10,7 +10,7 @@ CLANG_ARGS?=-g $(OPT_ARGS)
 ROOT?=..
 LIBCXXABI=$(ROOT)/vendor/llvm-dune/llvm-project/libcxxabi
 
-llvm-config=$(shell opam config var conf-llvm:config)
+llvm-config=$(shell opam var conf-llvm:config)
 LLVM_BIN=$(shell ${llvm-config} --bindir)
 LLVM_INCLUDE=$(shell ${llvm-config} --includedir)
 LLVM_CFLAGS=$(shell ${llvm-config} --cflags)
diff --git a/sledge/test/Makefile b/sledge/test/Makefile
index 78f77cefe..08b118738 100644
--- a/sledge/test/Makefile
+++ b/sledge/test/Makefile
@@ -34,11 +34,11 @@ sledge_report_exe:
 diff?=patdiff
 
 # select llvm and clang used by opam
-export PATH := $(shell $$(opam config var conf-llvm:config) --bindir):$(PATH)
+export PATH := $(shell $$(opam var conf-llvm:config) --bindir):$(PATH)
 
 # query llvm-config for compilation flags
-C_FLAGS = $(shell $$(opam config var conf-llvm:config) --cflags)
-CXX_FLAGS = $(shell $$(opam config var conf-llvm:config) --cxxflags)
+C_FLAGS = $(shell $$(opam var conf-llvm:config) --cflags)
+CXX_FLAGS = $(shell $$(opam var conf-llvm:config) --cxxflags)
 
 # configure sort
 export LANG := C