Update shell.nix

Author: hamphet

shell.nix

@@ -1,23 +1,26 @@
 with import <nixpkgs> {};
 let
-  pkgs = import (builtins.fetchGit {
-    # Descriptive name to make the store path easier to identify
-    name = "cmake24-revision";
-    url = "https://github.com/NixOS/nixpkgs/";
-    ref = "refs/heads/nixpkgs-unstable";
-    rev = "55070e598e0e03d1d116c49b9eff322ef07c6ac6";
-  }) {};
-
-  cmake24 = pkgs.cmake;
+  # pkgs = import (builtins.fetchGit {
+  #   # Descriptive name to make the store path easier to identify
+  #   name = "cmake24-revision";
+  #   url = "https://github.com/NixOS/nixpkgs/";
+  #   ref = "refs/heads/nixpkgs-unstable";
+  #   rev = "55070e598e0e03d1d116c49b9eff322ef07c6ac6";
+  # }) {};
+  #
+  # cmake24 = pkgs.cmake;
   gccForLibs = stdenv.cc.cc;
+  nativeCC = pkgsBuildBuild.targetPackages.stdenv.cc;
+  nativeBintools = nativeCC.bintools.bintools;
 in stdenv.mkDerivation {
     name = "llvm-env";
     buildInputs = [
       bashInteractive
       python3
       ninja
-      cmake24
+      cmake
       llvmPackages_latest.llvm
+      libbfd
     ];
 
     # where to find libgcc
@@ -26,27 +29,67 @@ in stdenv.mkDerivation {
     CFLAGS="-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version} -B ${stdenv.cc.libc}/lib";
 
     cmakeFlags = [
-      "-DGCC_INSTALL_PREFIX=${gcc}"
+      "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc"
+      "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++"
+      "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar"
+      "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip"
+      "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib"
       "-DC_INCLUDE_DIRS=${stdenv.cc.libc.dev}/include"
+
+      "-DCMAKE_INSTALL_PREFIX=../inst"
+      "-DCMAKE_INSTALL_BINDIR=$../inst/bin"
+      "-DCMAKE_INSTALL_INCLUDEDIR=../inst/include"
+      "-DCMAKE_INSTALL_LIBDIR=$../inst/lib"
+      "-DCMAKE_INSTALL_LIBEXECDIR=$../inst/libexec"
+
       "-GNinja"
       "-DCMAKE_BUILD_TYPE=Release"
       "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-      "-DCMAKE_INSTALL_PREFIX=../inst"
       "-DLLVM_TARGETS_TO_BUILD=host"
+      "-DLLVM_ENABLE_PROJECTS=\"clang;clang-tools-extra;lld;mlir;polly\""
+      "-DLLVM_ENABLE_RUNTIMES=\"compiler-rt;libcxx;libcxxabi;libunwind\""
+
+      "-DLLVM_POLLY_LINK_INTO_TOOLS=ON"
+      "-DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON"
+      "-DLLVM_LINK_LLVM_DYLIB=ON"
+      "-DLLVM_ENABLE_EH=ON"
+      "-DLLVM_ENABLE_RTTI=ON"
       "-DLLVM_ENABLE_FFI=ON"
+      "-DLLVM_INCLUDE_DOCS=OFF"
+      "-DLLVM_OPTIMIZED_TABLEGEN=ON"
+      "-DLLVM_INCLUDE_TESTS=OFF"
+      "-DLLVM_INSTALL_UTILS=ON"
+
       "-DLLVM_ENABLE_DUMP=ON"
       "-DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF"
-      "-DLLVM_ENABLE_PROJECTS=\"clang;clang-tools-extra;lld;libc;libclc;lldb\""
-      "-DLLVM_ENABLE_RUNTIMES=\"compiler-rt;libcxx;libcxxabi;libunwind\""
-      "-DLLVM_INSTALL_UTILS=ON"
       "-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
+
+      "-DLLVM_ENABLE_LIBXML2=OFF"
+      "-DLLVM_ENABLE_LIBCXX=OFF"
+      "-DCLANG_DEFAULT_CXX_STDLIB=libstdc++"
+
+      "-DCLANG_FORCE_MATCHING_LIBCLANG_SOVERSION=OFF"
+
+      "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include"
+
+      "-DLIBCXX_INSTALL_MODULES=ON"
       "-DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=ON"
       "-DLIBCXX_STATICALLY_LINK_ABI_IN_SHARED_LIBRARY=OFF"
       "-DLIBCXX_STATICALLY_LINK_ABI_IN_STATIC_LIBRARY=ON"
       "-DLIBCXX_USE_COMPILER_RT=ON"
+      "-DLIBCXX_HAS_ATOMIC_LIB=OFF"
+
+      "-DLIBCXXABI_ENABLE_STATIC_UNWINDER=ON"
+      "-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_SHARED_LIBRARY=OFF"
+      "-DLIBCXXABI_STATICALLY_LINK_UNWINDER_IN_STATIC_LIBRARY=ON"
       "-DLIBCXXABI_USE_COMPILER_RT=ON"
       "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
-      "-DLLVM_ENABLE_EH=ON"
-      "-DLLVM_ENABLE_RTTI=ON"
+
+      "-DLIBUNWIND_USE_COMPILER_RT=ON"
+      "-DCOMPILER_RT_USE_BUILTINS_LIBRARY=ON"
+      "-DCOMPILER_RT_USE_LLVM_UNWINDER=ON"
+
+      "-DSANITIZER_CXX_ABI=libc++"
+      "-DSANITIZER_TEST_CXX=libc++"
     ];
   }