From c6b8b4688b44c2e888ff0133561e043addd63e11 Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Thu, 3 Oct 2019 08:56:02 -0700
Subject: [PATCH] [sledge] Move llvm build and install dirs out of llvm source
 tree

Summary:
Since version 2, none of the `opam pin` modes work reasonably well for
the standard llvm build procedure. As a workaround to prevent opam
from making several copies of the build directory when pinning, adjust
to move the llvm build and install directories out of the llvm source
tree.

Reviewed By: bennostein

Differential Revision: D17665242

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

diff --git a/sledge/.gitignore b/sledge/.gitignore
index b903df7ee..e1471f11f 100644
--- a/sledge/.gitignore
+++ b/sledge/.gitignore
@@ -1,3 +1,5 @@
+.llvm_build
+.llvm_install
 .merlin
 /llvm/
 /model/dune
diff --git a/sledge/model/Makefile b/sledge/model/Makefile
index e64b623db..273ea2a29 100644
--- a/sledge/model/Makefile
+++ b/sledge/model/Makefile
@@ -10,7 +10,7 @@ CLANG_ARGS?=-g $(OPT_ARGS)
 # select llvm and clang
 SWITCH?=$(shell opam switch show)
 ROOT?=..
-LLVM=$(ROOT)/llvm/_install/$(SWITCH)
+LLVM=$(ROOT)/.llvm_install/$(SWITCH)
 
 LIBCXXABI=$(ROOT)/llvm/projects/libcxxabi
 
diff --git a/sledge/test/Makefile b/sledge/test/Makefile
index 8bdb5afed..d1f7059dd 100644
--- a/sledge/test/Makefile
+++ b/sledge/test/Makefile
@@ -21,7 +21,7 @@ SLEDGE=./wrap.sh $(TIMEOUT) $(MEMOUT) $(SLEDGE_EXE)
 DIFF?=diff
 
 # configure the non-host llvm and clang
-export PATH := $(CURDIR)/../llvm/_install/sledge/bin:$(PATH)
+export PATH := $(CURDIR)/../.llvm_install/sledge/bin:$(PATH)
 
 default: test