Unverified Commit fbf1b246 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

clang-uml: fix build on linux and darwin (#457905)

parents fa972b1d c5a9d8c4
Loading
Loading
Loading
Loading
+29 −0
Original line number Diff line number Diff line
diff --git a/cmake/LibUnwindSetup.cmake b/cmake/LibUnwindSetup.cmake
index a7cfca9..9f451f4 100644
--- a/cmake/LibUnwindSetup.cmake
+++ b/cmake/LibUnwindSetup.cmake
@@ -1,22 +1,7 @@
 if(APPLE)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
         message(STATUS "AppleClang compiler detected: using system libunwind.")
-    elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm" OR "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-            if("${CMAKE_CXX_COMPILER}" MATCHES "/opt/homebrew/")
-                set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}/unwind")
-                message(STATUS "Homebrew Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}")
-            elseif("${CMAKE_CXX_COMPILER}" MATCHES "/opt/local/")
-                set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}/libunwind")
-                message(STATUS "MacPorts Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}")
-            endif()
-        elseif("${CMAKE_CXX_COMPILER}" MATCHES "/usr/local/opt/" OR "${CMAKE_CXX_COMPILER}" MATCHES "/usr/local/Cellar/")
-            set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}")
-            message(STATUS "Homebrew Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}")
-        elseif("${CMAKE_CXX_COMPILER}" MATCHES "/opt/local/")
-                set(LIBUNWIND_PREFIX "${LLVM_LIBRARY_DIR}/libunwind")
-                message(STATUS "MacPorts Clang compiler detected: using libunwind from ${LIBUNWIND_PREFIX}")
-        endif()
-        set(LIBUNWIND_LIBRARY ${LIBUNWIND_PREFIX}/libunwind.dylib)
+    else()
+        message(STATUS "Using system libunwind (provided by libSystem).")
     endif()
 endif(APPLE)
 No newline at end of file
+6 −2
Original line number Diff line number Diff line
@@ -17,15 +17,19 @@
}:
stdenv.mkDerivation (finalAttrs: {
  pname = "clang-uml";
  version = "0.6.1";
  version = "0.6.2";

  src = fetchFromGitHub {
    owner = "bkryza";
    repo = "clang-uml";
    rev = finalAttrs.version;
    hash = "sha256-mY6kJnwWLgCeKXSquNTxsnr4S3bKwedgiRixzyLWTK8=";
    hash = "sha256-hGjLOyduTc+yOQhO5gDKNfY0fDvbUfvF0FrdjrDheyw=";
  };

  patches = [
    ./darwin-system-libunwind.patch
  ];

  nativeBuildInputs = [
    cmake
    pkg-config