diff options
| author | Lorenzo Manacorda <lorenzo@mailbox.org> | 2018-12-14 14:05:46 +0100 |
|---|---|---|
| committer | Lorenzo Manacorda <lorenzo@mailbox.org> | 2018-12-14 14:05:46 +0100 |
| commit | f25fb4b03f7dfd99f98d2c4cceba742c773ed530 (patch) | |
| tree | 82ea4a31cd56db1ed7cc19b0b49df94adcccc8f4 /pkgs/development | |
| parent | 4655478c3dda55191eb527b602d57275aa33327e (diff) | |
| download | nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.tar nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.tar.gz nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.tar.bz2 nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.tar.lz nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.tar.xz nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.tar.zst nixlib-f25fb4b03f7dfd99f98d2c4cceba742c773ed530.zip | |
solc: disable LLL installation
It has been [disabled by default](https://github.com/ethereum/solidity/releases/tag/v0.5.1) in 0.5.1.
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/solc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/solc/patches/shared-libs-install.patch | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index af9ddb872f9c..38a554a3fe3e 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -33,11 +33,10 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBoost_USE_STATIC_LIBS=OFF" "-DBUILD_SHARED_LIBS=ON" - "-DINSTALL_LLLC=ON" ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + + checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; @@ -47,7 +46,6 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; - longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch index fa30655e04e8..0fb693ef4218 100644 --- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch +++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch @@ -2,7 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c05208f..8893648e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -48,6 +48,25 @@ add_subdirectory(libevmasm) +@@ -48,6 +48,22 @@ add_subdirectory(libevmasm) add_subdirectory(libsolidity) add_subdirectory(libsolc) @@ -21,9 +21,6 @@ index 0c05208f..8893648e 100644 +install(DIRECTORY liblangutil/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil + FILES_MATCHING PATTERN "*.h") -+install(DIRECTORY liblll/ -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll -+ FILES_MATCHING PATTERN "*.h") + if (NOT EMSCRIPTEN) add_subdirectory(solc) @@ -46,15 +43,6 @@ index 86192c1b..e7f15e93 100644 add_library(evmasm ${sources} ${headers}) target_link_libraries(evmasm PUBLIC devcore) +install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt -index 4cdc073a..b61f03c7 100644 ---- a/liblll/CMakeLists.txt -+++ b/liblll/CMakeLists.txt -@@ -3,3 +3,4 @@ file(GLOB headers "*.h") - - add_library(lll ${sources} ${headers}) - target_link_libraries(lll PUBLIC evmasm devcore) -+install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt index 0bdec4b4..e876177e 100644 --- a/libsolidity/CMakeLists.txt |