From 73e3559d4a24eda9a202ef2ee0d18d32dd1da72a Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sun, 28 Jun 2020 13:31:01 -0700
Subject: [PATCH 1/3] Updated ABSL and finally used ABSL's CMake build system.

---
 CMakeLists.txt | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8309cffe..2f8bbe54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -159,24 +159,6 @@ add_library(libbloaty STATIC
     src/macho.cc
     src/range_map.cc
     src/webassembly.cc
-    # Until Abseil has a proper CMake build system
-    third_party/abseil-cpp/absl/base/internal/raw_logging.cc # Grrrr...
-    third_party/abseil-cpp/absl/base/internal/throw_delegate.cc
-    third_party/abseil-cpp/absl/numeric/int128.cc
-    third_party/abseil-cpp/absl/strings/ascii.cc
-    third_party/abseil-cpp/absl/strings/charconv.cc
-    third_party/abseil-cpp/absl/strings/escaping.cc
-    third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc
-    third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc
-    third_party/abseil-cpp/absl/strings/internal/memutil.cc
-    third_party/abseil-cpp/absl/strings/internal/utf8.cc
-    third_party/abseil-cpp/absl/strings/match.cc
-    third_party/abseil-cpp/absl/strings/numbers.cc
-    third_party/abseil-cpp/absl/strings/str_cat.cc
-    third_party/abseil-cpp/absl/strings/string_view.cc
-    third_party/abseil-cpp/absl/strings/str_split.cc
-    third_party/abseil-cpp/absl/strings/substitute.cc
-    third_party/abseil-cpp/absl/types/bad_optional_access.cc
     # One source file, no special build system needed.
     third_party/demumble/third_party/libcxxabi/cxa_demangle.cpp
     )
@@ -202,6 +184,9 @@ else(UNIX)
     set(LIBBLOATY_LIBS libbloaty libprotoc re2 capstone-static)
 endif(UNIX)
 
+add_subdirectory(third_party/abseil-cpp)
+set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} absl::strings)
+
 if(UNIX)
   if(${RE2_FOUND})
     link_directories(${RE2_LIBRARY_DIRS})

From 18e47492c12500fa3b3b1196e4a9ab6986966ac4 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sun, 28 Jun 2020 13:32:43 -0700
Subject: [PATCH 2/3] Updated ABSL.

---
 third_party/abseil-cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/abseil-cpp b/third_party/abseil-cpp
index 1948f6f9..b86fff16 160000
--- a/third_party/abseil-cpp
+++ b/third_party/abseil-cpp
@@ -1 +1 @@
-Subproject commit 1948f6f967e34db9793cfa8b4bcbaf370d039fd8
+Subproject commit b86fff162e15ad8ee534c25e58bf522330e8376d

From 8a48ec617eee94ad94db40a2fe42fcc52b51fae3 Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Sun, 28 Jun 2020 13:58:54 -0700
Subject: [PATCH 3/3] Fix for CMake build of tests.

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f8bbe54..47edfbe4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,6 +186,7 @@ endif(UNIX)
 
 add_subdirectory(third_party/abseil-cpp)
 set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} absl::strings)
+set(LIBBLOATY_LIBS ${LIBBLOATY_LIBS} absl::optional)
 
 if(UNIX)
   if(${RE2_FOUND})