From 1bac0517c458d11074f802497dd38029c5c37ac8 Mon Sep 17 00:00:00 2001
From: Marko Ivanovich <ivanovich@yandex-team.ru>
Date: Thu, 28 Oct 2021 23:38:35 +0300
Subject: [PATCH] Improve developer's first experience

---
 .gitignore | 2 ++
 README.md  | 2 ++
 coz        | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d6a0bde..74211b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ benchmarks/pbzip2/bzip2-1.0.6
 benchmarks/string_match/string_match_datafiles
 benchmarks/word_count/word_count_datafiles
 
+build/
+
 viewer/node_modules
 rust/Cargo.lock
 rust/target
diff --git a/README.md b/README.md
index 0d41605..11b83c8 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,8 @@ $ pip install conan --user
 $ git clone https://github.com/plasma-umass/coz.git
 $ cd coz
 $ mkdir build && cd build
+$ # This helps to avoid problems with linker failing to find C++ symbols:
+$ conan profile update settings.compiler.libcxx=libstdc++11 default
 $ conan install ..
 $ cmake ..
 $ make
diff --git a/coz b/coz
index 3f8830e..5f7c50b 100755
--- a/coz
+++ b/coz
@@ -59,7 +59,9 @@ def _coz_run(args):
     os.path.join(coz_prefix, '..', 'lib', 'coz-profiler', 'libcoz.so'),
 
     # Local library under development directory
-    os.path.join('libcoz', 'libcoz.so')      # Local library during development
+    os.path.join('libcoz', 'libcoz.so'),      # Local library during development
+    os.path.join(coz_prefix, 'libcoz', 'libcoz.so'),
+    os.path.join(coz_prefix, 'build', 'libcoz', 'libcoz.so'),
   ]
 
   # Find the first library location that exists