From ad790163c1476be2b8f41ac030cca1b370a491ea Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Wed, 29 Jun 2022 19:09:31 +0800 Subject: [PATCH 1/6] aaa Signed-off-by: zhenshan.cao --- internal/core/CMakeLists.txt | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index e82f4dce79f..7834c38fb9f 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -28,8 +28,28 @@ cmake_minimum_required( VERSION 3.18 ) if ( APPLE ) set( CMAKE_CROSSCOMPILING TRUE ) set( RUN_HAVE_GNU_POSIX_REGEX 0 ) - set( CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang" ) - set( CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++" ) + message( STATUS "DDDDDDDDDDDDDDDDDD") + if(EXISTS "/usr/local/opt/llvm/bin/clang") + message( STATUS "Check clang exist" ) + set( CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang" ) + else() + execute_process ( + COMMAND bash -c "which clang" + OUTPUT_VARIABLE outClangVar + ) + message( STATUS "Check clang not exist, set to ${outClangVar}") + endif() + + if(EXISTS "/usr/local/opt/llvm/bin/clang++") + message( STATUS "Check clang++ exist" ) + set( CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++" ) + else() + execute_process ( + COMMAND bash -c "which clang++" + OUTPUT_VARIABLE outClangPlusVar + ) + message( STATUS "Check clang++ not exist, set to ${outClangPlusVar}") + endif() endif () add_definitions(-DELPP_THREAD_SAFE) From 4ec6bbf4f80b0d5d2513e02b99f65d28f1d9d6b6 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Wed, 29 Jun 2022 19:41:54 +0800 Subject: [PATCH 2/6] aaa Signed-off-by: zhenshan.cao --- internal/core/CMakeLists.txt | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index 7834c38fb9f..3041cbf483f 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -29,26 +29,32 @@ if ( APPLE ) set( CMAKE_CROSSCOMPILING TRUE ) set( RUN_HAVE_GNU_POSIX_REGEX 0 ) message( STATUS "DDDDDDDDDDDDDDDDDD") + execute_process ( + COMMAND bash -c "brew --prefix llvm" + OUTPUT_VARIABLE LLVM_PREFIX + ) + if(EXISTS "/usr/local/opt/llvm/bin/clang") message( STATUS "Check clang exist" ) set( CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang" ) else() - execute_process ( - COMMAND bash -c "which clang" - OUTPUT_VARIABLE outClangVar - ) - message( STATUS "Check clang not exist, set to ${outClangVar}") + # execute_process ( + #COMMAND bash -c "brew --prefix llvm" + #OUTPUT_VARIABLE outClangVar + #) + message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang") endif() if(EXISTS "/usr/local/opt/llvm/bin/clang++") message( STATUS "Check clang++ exist" ) set( CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++" ) else() - execute_process ( - COMMAND bash -c "which clang++" - OUTPUT_VARIABLE outClangPlusVar - ) - message( STATUS "Check clang++ not exist, set to ${outClangPlusVar}") + #execute_process ( + #COMMAND bash -c "which clang++" + #OUTPUT_VARIABLE outClangPlusVar + #) + message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang++") + # message( STATUS "Check clang++ not exist, set to ${outClangPlusVar}") endif() endif () From bfdb279ce38235b088fe098447e3bbf2e24e46bc Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Wed, 29 Jun 2022 19:51:44 +0800 Subject: [PATCH 3/6] aaa Signed-off-by: zhenshan.cao --- internal/core/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index 3041cbf483f..01a110c932e 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -25,6 +25,7 @@ cmake_minimum_required( VERSION 3.18 ) # add_compile_options(-fno-stack-protector -fno-omit-frame-pointer -fno-var-tracking -fsanitize=address) # add_link_options(-fno-stack-protector -fno-omit-frame-pointer -fno-var-tracking -fsanitize=address) +project(core) if ( APPLE ) set( CMAKE_CROSSCOMPILING TRUE ) set( RUN_HAVE_GNU_POSIX_REGEX 0 ) @@ -62,7 +63,6 @@ add_definitions(-DELPP_THREAD_SAFE) set(CMAKE_POSITION_INDEPENDENT_CODE ON) message( STATUS "Building using CMake version: ${CMAKE_VERSION}" ) -project(core) include(CheckCXXCompilerFlag) if ( APPLE ) message(STATUS "==============Darwin Environment==============") From fcc0fa157cf944950e8a6a645c0d9ebb15e5fb5d Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Wed, 29 Jun 2022 20:10:37 +0800 Subject: [PATCH 4/6] ccc Signed-off-by: zhenshan.cao --- internal/core/CMakeLists.txt | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index 01a110c932e..9ab9962191f 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -29,34 +29,16 @@ project(core) if ( APPLE ) set( CMAKE_CROSSCOMPILING TRUE ) set( RUN_HAVE_GNU_POSIX_REGEX 0 ) - message( STATUS "DDDDDDDDDDDDDDDDDD") + execute_process ( COMMAND bash -c "brew --prefix llvm" OUTPUT_VARIABLE LLVM_PREFIX ) - if(EXISTS "/usr/local/opt/llvm/bin/clang") - message( STATUS "Check clang exist" ) - set( CMAKE_C_COMPILER "/usr/local/opt/llvm/bin/clang" ) - else() - # execute_process ( - #COMMAND bash -c "brew --prefix llvm" - #OUTPUT_VARIABLE outClangVar - #) - message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang") - endif() - - if(EXISTS "/usr/local/opt/llvm/bin/clang++") - message( STATUS "Check clang++ exist" ) - set( CMAKE_CXX_COMPILER "/usr/local/opt/llvm/bin/clang++" ) - else() - #execute_process ( - #COMMAND bash -c "which clang++" - #OUTPUT_VARIABLE outClangPlusVar - #) - message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang++") - # message( STATUS "Check clang++ not exist, set to ${outClangPlusVar}") - endif() + set( CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang" ) + message( STATUS "Check clang set to ${LLVM_PREFIX}/bin/clang") + set( CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++" ) + message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang++") endif () add_definitions(-DELPP_THREAD_SAFE) From 248ff97d65a5c4f787b1207626463ebedf5e21ea Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Thu, 30 Jun 2022 15:02:41 +0800 Subject: [PATCH 5/6] ccc Signed-off-by: zhenshan.cao --- scripts/core_build.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/scripts/core_build.sh b/scripts/core_build.sh index a4e06028b2d..fac3a32a0cd 100755 --- a/scripts/core_build.sh +++ b/scripts/core_build.sh @@ -169,10 +169,31 @@ if [[ ${MAKE_CLEAN} == "ON" ]]; then exit 0 fi + +function determineLLVMPrefix() +{ + llvm_prefix="$(brew --prefix llvm)" + + if [ -d "$llvm_prefix" ]; then + echo "set llvm_prefix to $llvm_prefix" + else + llvm_hard_prefix=`ls -d ${llvm_prefix}* | tail -n 1` + if [ -d "$llvm_hard_prefix" ]; then + llvm_prefix=${llvm_hard_prefix} + echo "set llvm_prefix to ${llvm_prefix}" + else + echo "llvm not found" + fi + fi +} + + + unameOut="$(uname -s)" case "${unameOut}" in Darwin*) - llvm_prefix="$(brew --prefix llvm)" + #llvm_prefix="$(brew --prefix llvm)" + determineLLVMPrefix export CLANG_TOOLS_PATH="${llvm_prefix}/bin" export CC="${llvm_prefix}/bin/clang" export CXX="${llvm_prefix}/bin/clang++" From c3bebaec0702ec89225702c233776b2e289f90a0 Mon Sep 17 00:00:00 2001 From: "zhenshan.cao" Date: Thu, 30 Jun 2022 15:03:39 +0800 Subject: [PATCH 6/6] eee Signed-off-by: zhenshan.cao --- internal/core/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/core/CMakeLists.txt b/internal/core/CMakeLists.txt index 9ab9962191f..0576b43de8a 100644 --- a/internal/core/CMakeLists.txt +++ b/internal/core/CMakeLists.txt @@ -35,10 +35,10 @@ if ( APPLE ) OUTPUT_VARIABLE LLVM_PREFIX ) - set( CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang" ) - message( STATUS "Check clang set to ${LLVM_PREFIX}/bin/clang") - set( CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++" ) - message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang++") + #set( CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang" ) + #message( STATUS "Check clang set to ${LLVM_PREFIX}/bin/clang") + #set( CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++" ) + #message( STATUS "Check clang not exist, set to ${LLVM_PREFIX}/bin/clang++") endif () add_definitions(-DELPP_THREAD_SAFE)