571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 73d5c3c84..e4b0dbfd1 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -104,13 +104,6 @@ option(SOUFFLE_CUSTOM_GETOPTLONG "Enable/Disable custom getopt_long implementati
|
|
cmake_dependent_option(SOUFFLE_USE_LIBCPP "Link to libc++ instead of libstdc++" ON
|
|
"CMAKE_CXX_COMPILER_ID STREQUAL Clang" OFF)
|
|
|
|
-# Using Clang? Likely want to use `lld` too.
|
|
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|
|
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
|
|
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
|
|
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
|
|
-endif()
|
|
-
|
|
# Add aditional modules to CMake
|
|
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
|
|
|
|
@@ -247,7 +240,11 @@ endif()
|
|
# pthreads
|
|
# --------------------------------------------------
|
|
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
-find_package(Threads REQUIRED)
|
|
+set(CMAKE_THREAD_LIBS_INIT "-lpthread")
|
|
+set(CMAKE_HAVE_THREADS_LIBRARY 1)
|
|
+set(CMAKE_USE_WIN32_THREADS_INIT 0)
|
|
+set(CMAKE_USE_PTHREADS_INIT 1)
|
|
+set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
|
|
# --------------------------------------------------
|
|
# OpenMP
|