mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 23:54:01 +00:00
63 lines
2.3 KiB
Diff
63 lines
2.3 KiB
Diff
From 9866ce8f538e1ab1f0902408b7575013b768f365 Mon Sep 17 00:00:00 2001
|
|
From: Zane van Iperen <zane@zanevaniperen.com>
|
|
Date: Wed, 2 Feb 2022 23:41:59 +1000
|
|
Subject: [PATCH] llvm/ExecutionEngine/IntelJITEvents: only use
|
|
ITTAPI_SOURCE_DIR
|
|
|
|
---
|
|
.../IntelJITEvents/CMakeLists.txt | 32 ++-----------------
|
|
1 file changed, 2 insertions(+), 30 deletions(-)
|
|
|
|
diff --git a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
|
|
index 0c5017c3..d20c35f3 100644
|
|
--- a/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
|
|
+++ b/llvm/lib/ExecutionEngine/IntelJITEvents/CMakeLists.txt
|
|
@@ -1,34 +1,6 @@
|
|
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
|
|
|
|
-if(NOT DEFINED ITTAPI_GIT_REPOSITORY)
|
|
- set(ITTAPI_GIT_REPOSITORY https://github.com/intel/ittapi.git)
|
|
-endif()
|
|
-
|
|
-if(NOT DEFINED ITTAPI_GIT_TAG)
|
|
- set(ITTAPI_GIT_TAG v3.18.12)
|
|
-endif()
|
|
-
|
|
-if(NOT DEFINED ITTAPI_SOURCE_DIR)
|
|
- set(ITTAPI_SOURCE_DIR ${PROJECT_BINARY_DIR})
|
|
-endif()
|
|
-
|
|
-if(NOT EXISTS ${ITTAPI_SOURCE_DIR}/ittapi)
|
|
- execute_process(COMMAND ${GIT_EXECUTABLE} clone ${ITTAPI_GIT_REPOSITORY}
|
|
- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}
|
|
- RESULT_VARIABLE GIT_CLONE_RESULT)
|
|
- if(NOT GIT_CLONE_RESULT EQUAL "0")
|
|
- message(FATAL_ERROR "git clone ${ITTAPI_GIT_REPOSITORY} failed with ${GIT_CLONE_RESULT}, please clone ${ITTAPI_GIT_REPOSITORY}")
|
|
- endif()
|
|
-endif()
|
|
-
|
|
-execute_process(COMMAND ${GIT_EXECUTABLE} checkout ${ITTAPI_GIT_TAG}
|
|
- WORKING_DIRECTORY ${ITTAPI_SOURCE_DIR}/ittapi
|
|
- RESULT_VARIABLE GIT_CHECKOUT_RESULT)
|
|
-if(NOT GIT_CHECKOUT_RESULT EQUAL "0")
|
|
- message(FATAL_ERROR "git checkout ${ITTAPI_GIT_TAG} failed with ${GIT_CHECKOUT_RESULT}, please checkout ${ITTAPI_GIT_TAG} at ${ITTAPI_SOURCE_DIR}/ittapi")
|
|
-endif()
|
|
-
|
|
-include_directories( ${ITTAPI_SOURCE_DIR}/ittapi/include/ )
|
|
+include_directories( ${ITTAPI_SOURCE_DIR}/include/ )
|
|
|
|
if( HAVE_LIBDL )
|
|
set(LLVM_INTEL_JIT_LIBS ${CMAKE_DL_LIBS})
|
|
@@ -40,7 +12,7 @@ set(LLVM_INTEL_JIT_LIBS ${LLVM_PTHREAD_LIB} ${LLVM_INTEL_JIT_LIBS})
|
|
add_llvm_component_library(LLVMIntelJITEvents
|
|
IntelJITEventListener.cpp
|
|
jitprofiling.c
|
|
- ${ITTAPI_SOURCE_DIR}/ittapi/src/ittnotify/ittnotify_static.c
|
|
+ ${ITTAPI_SOURCE_DIR}/src/ittnotify/ittnotify_static.c
|
|
|
|
LINK_LIBS ${LLVM_INTEL_JIT_LIBS}
|
|
|
|
--
|
|
2.34.1
|
|
|