From 9ba1482fc2e211ee04a1b9ba5de0c5ee9b3abe7f Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Tue, 18 Jun 2019 19:21:51 +0000
Subject: [PATCH] Cleanup dependencies

---
 CMakeLists.txt              | 3 ++-
 dbt-core                    | 2 +-
 platform/CMakeLists.txt     | 3 +++
 platform/src/CMakeLists.txt | 2 +-
 riscv                       | 2 +-
 scc                         | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b814af7..e1d3d08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ setup_conan()
 
 # This line finds the boost lib and headers. 
 set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
-find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
 
 if(DEFINED ENV{LLVM_HOME})
 	find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm)
@@ -70,6 +69,8 @@ message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser)
 
+set(BUILD_SHARED_LIBS 1)
+
 find_package(Threads)
 find_package(Tcmalloc)
 find_package(ZLIB)
diff --git a/dbt-core b/dbt-core
index c449c3c..a16e635 160000
--- a/dbt-core
+++ b/dbt-core
@@ -1 +1 @@
-Subproject commit c449c3c0c8670addfa2e76cecd03d75764f17656
+Subproject commit a16e635fadc673d34b16916f066dfa2ba6cf2be2
diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index 5873610..74867d9 100644
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -11,6 +11,9 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
 project("platform")
 
 include(Common)
+
+find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
+
 # check that we have averything we need
 if(!SystemC_FOUND)
     message( FATAL_ERROR "SystemC library not found." )
diff --git a/platform/src/CMakeLists.txt b/platform/src/CMakeLists.txt
index 666b523..ae0b6c4 100644
--- a/platform/src/CMakeLists.txt
+++ b/platform/src/CMakeLists.txt
@@ -30,7 +30,7 @@ set(LIBRARY_NAME platform)
 #add_definitions(-DSC_DEFAULT_WRITER_POLICY=SC_MANY_WRITERS)
 
 # Define the library
-add_library(${LIBRARY_NAME} SHARED ${LIB_SOURCES})
+add_library(${LIBRARY_NAME} ${LIB_SOURCES})
 
 # Links the target exe against the libraries
 target_link_libraries(${LIBRARY_NAME} riscv_sc)
diff --git a/riscv b/riscv
index 2758933..d93c2fe 160000
--- a/riscv
+++ b/riscv
@@ -1 +1 @@
-Subproject commit 2758933c16a6a0d8b5ade685b0ceb44a329343be
+Subproject commit d93c2feec4c80ece0773fb2366821d01e11db4b6
diff --git a/scc b/scc
index 6df4ea9..4be77af 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 6df4ea9df4f379a2ab5903258f8bd7e72c74ffce
+Subproject commit 4be77aff604dc78f3c0856b6d17843b276b80b59