From b4fcce0bde81939c8401ff8ec011850299cd4662 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 13 Nov 2018 14:01:15 +0000
Subject: Do not build LLL unless requested via the LLL cmake option

---
 CMakeLists.txt | 9 ++++++---
 Changelog.md   | 1 +
 docs/lll.rst   | 7 +++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8a0e56d..86769672 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,9 +11,10 @@ eth_policy()
 set(PROJECT_VERSION "0.5.1")
 project(solidity VERSION ${PROJECT_VERSION})
 
+option(LLL "Build LLL" OFF)
 option(SOLC_LINK_STATIC "Link solc executable statically on supported platforms" OFF)
 option(LLLC_LINK_STATIC "Link lllc executable statically on supported platforms" OFF)
-option(INSTALL_LLLC "Include lllc executable in installation" OFF)
+option(INSTALL_LLLC "Include lllc executable in installation" ${LLL})
 
 # Setup cccache.
 include(EthCcache)
@@ -50,8 +51,10 @@ add_subdirectory(libsolc)
 
 if (NOT EMSCRIPTEN)
 	add_subdirectory(solc)
-	add_subdirectory(liblll)
-	add_subdirectory(lllc)
+	if (LLL)
+		add_subdirectory(liblll)
+		add_subdirectory(lllc)
+	endif()
 endif()
 
 if (TESTS AND NOT EMSCRIPTEN)
diff --git a/Changelog.md b/Changelog.md
index bb97c35b..b5e7eed8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Build System: LLL is not built anymore by default. Must configure it with CMake as `-DLLL=ON`.
 
 
 Bugfixes:
diff --git a/docs/lll.rst b/docs/lll.rst
index d9409bf8..16be829e 100644
--- a/docs/lll.rst
+++ b/docs/lll.rst
@@ -9,6 +9,13 @@ LLL is a low-level language for the EVM with an s-expressions syntax.
 The Solidity repository contains an LLL compiler, which shares the assembler subsystem with Solidity.
 However, apart from maintaining that it still compiles, no other improvements are made to it.
 
+It is not built unless specifically requested:
+
+.. code-block:: bash
+
+    $ cmake -DLLL=ON ..
+    $ cmake --build .
+
 .. warning::
 
     The LLL codebase is deprecated and will be removed from the Solidity repository in the future.
-- 
cgit v1.2.3