mirror of
https://github.com/ziglang/zig.git
synced 2024-11-15 08:33:06 +00:00
f3ebfcae38
Conflicts: * cmake/Findclang.cmake * cmake/Findlld.cmake * cmake/Findllvm.cmake In master branch, more search paths were added to these files with "12" in the path. In this commit I updated them to "13". * src/stage1/codegen.cpp * src/zig_llvm.cpp * src/zig_llvm.h In master branch, ZigLLVMBuildCmpXchg is improved to add `is_single_threaded`. However, the LLVM 13 C API has this already, and in the llvm13 branch, ZigLLVMBuildCmpXchg is deleted in favor of the C API. In this commit I updated stage2 to use the LLVM 13 C API rather than depending on an improved ZigLLVMBuildCmpXchg. Additionally, src/target.zig largestAtomicBits needed to be updated to include the new m68k ISA.
91 lines
2.7 KiB
CMake
91 lines
2.7 KiB
CMake
# Copyright (c) 2016 Andrew Kelley
|
|
# This file is MIT licensed.
|
|
# See http://opensource.org/licenses/MIT
|
|
|
|
# CLANG_FOUND
|
|
# CLANG_INCLUDE_DIRS
|
|
# CLANG_LIBRARIES
|
|
# CLANG_LIBDIRS
|
|
|
|
find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
|
|
PATHS
|
|
/usr/lib/llvm/13/include
|
|
/usr/lib/llvm-13/include
|
|
/usr/lib/llvm-13.0/include
|
|
/usr/local/llvm130/include
|
|
/usr/local/llvm13/include
|
|
/usr/local/opt/llvm@13/include
|
|
/opt/homebrew/opt/llvm@13/include
|
|
/mingw64/include
|
|
)
|
|
|
|
if(ZIG_PREFER_CLANG_CPP_DYLIB)
|
|
find_library(CLANG_LIBRARIES
|
|
NAMES
|
|
clang-cpp-13.0
|
|
clang-cpp130
|
|
clang-cpp
|
|
PATHS
|
|
${CLANG_LIBDIRS}
|
|
/usr/lib/llvm/13/lib
|
|
/usr/lib/llvm/13/lib64
|
|
/usr/lib/llvm-13/lib
|
|
/usr/local/llvm130/lib
|
|
/usr/local/llvm13/lib
|
|
/usr/local/opt/llvm@13/lib
|
|
/opt/homebrew/opt/llvm@13/lib
|
|
)
|
|
endif()
|
|
|
|
if(NOT CLANG_LIBRARIES)
|
|
macro(FIND_AND_ADD_CLANG_LIB _libname_)
|
|
string(TOUPPER ${_libname_} _prettylibname_)
|
|
find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_}
|
|
PATHS
|
|
${CLANG_LIBDIRS}
|
|
/usr/lib/llvm/13/lib
|
|
/usr/lib/llvm-13/lib
|
|
/usr/lib/llvm-13.0/lib
|
|
/usr/local/llvm130/lib
|
|
/usr/local/llvm13/lib
|
|
/usr/local/opt/llvm@13/lib
|
|
/opt/homebrew/opt/llvm@13/lib
|
|
/mingw64/lib
|
|
/c/msys64/mingw64/lib
|
|
c:\\msys64\\mingw64\\lib
|
|
)
|
|
if(CLANG_${_prettylibname_}_LIB)
|
|
set(CLANG_LIBRARIES ${CLANG_LIBRARIES} ${CLANG_${_prettylibname_}_LIB})
|
|
endif()
|
|
endmacro(FIND_AND_ADD_CLANG_LIB)
|
|
|
|
FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
|
|
FIND_AND_ADD_CLANG_LIB(clangCodeGen)
|
|
FIND_AND_ADD_CLANG_LIB(clangFrontend)
|
|
FIND_AND_ADD_CLANG_LIB(clangDriver)
|
|
FIND_AND_ADD_CLANG_LIB(clangSerialization)
|
|
FIND_AND_ADD_CLANG_LIB(clangSema)
|
|
FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
|
|
FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
|
|
FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
|
|
FIND_AND_ADD_CLANG_LIB(clangAnalysis)
|
|
FIND_AND_ADD_CLANG_LIB(clangASTMatchers)
|
|
FIND_AND_ADD_CLANG_LIB(clangAST)
|
|
FIND_AND_ADD_CLANG_LIB(clangParse)
|
|
FIND_AND_ADD_CLANG_LIB(clangSema)
|
|
FIND_AND_ADD_CLANG_LIB(clangBasic)
|
|
FIND_AND_ADD_CLANG_LIB(clangEdit)
|
|
FIND_AND_ADD_CLANG_LIB(clangLex)
|
|
FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
|
|
FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
|
|
FIND_AND_ADD_CLANG_LIB(clangRewrite)
|
|
FIND_AND_ADD_CLANG_LIB(clangCrossTU)
|
|
FIND_AND_ADD_CLANG_LIB(clangIndex)
|
|
FIND_AND_ADD_CLANG_LIB(clangToolingCore)
|
|
endif()
|
|
|
|
include(FindPackageHandleStandardArgs)
|
|
find_package_handle_standard_args(clang DEFAULT_MSG CLANG_LIBRARIES CLANG_INCLUDE_DIRS)
|
|
|
|
mark_as_advanced(CLANG_INCLUDE_DIRS CLANG_LIBRARIES CLANG_LIBDIRS)
|