Skip to content

Commit

Permalink
Merge pull request #148 from winlin/release/3.0.x
Browse files Browse the repository at this point in the history
update eosio_build_darwin.sh clang version
  • Loading branch information
Thaipanda authored Mar 8, 2020
2 parents 6bf1964 + ecdab54 commit 3b240de
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions scripts/eosio_build_darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
printf "\\tPhysical Memory: %s Gbytes\\n" "${MEM_GIG}"
printf "\\tDisk install: %s\\n" "${DISK_INSTALL}"
printf "\\tDisk space total: %sG\\n" "${DISK_TOTAL}"
printf "\\tDisk space available: %sG\\n\\n" "${DISK_AVAIL}"
printf "\\tDisk space available: %sG\\n" "${DISK_AVAIL}"
printf "\\tTEMP_DIR: %s\\n\\n" "${TEMP_DIR}"


if [ "${MEM_GIG}" -lt 7 ]; then
echo "Your system must have 7 or more Gigabytes of physical memory installed."
Expand Down Expand Up @@ -430,7 +432,7 @@
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! git clone --depth 1 --single-branch --branch release_70 https://github.com/llvm-mirror/llvm.git
if ! git clone --depth 1 --single-branch --branch release_90 https://github.com/llvm-mirror/llvm.git
then
printf "\\tUnable to clone llvm repo @ https://github.com/llvm-mirror/llvm.git.\\n"
printf "\\tExiting now.\\n\\n"
Expand All @@ -442,7 +444,7 @@
printf "\\tExiting now.\\n\\n"
exit 1;
fi
if ! git clone --depth 1 --single-branch --branch release_40 https://github.com/llvm-mirror/clang.git
if ! git clone --depth 1 --single-branch --branch release_90 https://github.com/llvm-mirror/clang.git
then
printf "\\tUnable to clone clang repo @ https://github.com/llvm-mirror/clang.git.\\n"
printf "\\tExiting now.\\n\\n"
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif()

link_directories(${LLVM_LIBRARY_DIR})

set( CMAKE_CXX_STANDARD 14 )
set( CMAKE_CXX_STANDARD 17 )

include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")

Expand Down

0 comments on commit 3b240de

Please sign in to comment.