Skip to content

Commit 7e5f1a3

Browse files
aleasimsnkaskov
authored andcommitted
Get rid of rustc usage at zkLLVM configuration phase
Use LLVM_HOST_TRIPLE variable and strip release version from it.
1 parent aea5b96 commit 7e5f1a3

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

CMakeLists.txt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,19 @@ option(RSLANG_BUILD_TOOLS "Rust tools to build (see build.tools)" "")
142142

143143
set(RSLANG_BUILD_STAGE "2" CACHE STRING "Stage to build (see --stage)")
144144

145-
execute_process(COMMAND bash -c "rustc -vV | gawk -e '\$1 ~ /host:/ {printf \"%s\", \$2}'"
146-
OUTPUT_VARIABLE RUSTC_HOST_TRIPLE
147-
COMMAND_ERROR_IS_FATAL ANY)
148-
message("-- rustc host triple: ${RUSTC_HOST_TRIPLE}")
145+
execute_process(COMMAND sh -c "(uname -r) 2> /dev/null"
146+
RESULT_VARIABLE UNAME_RELEASE_RESULT
147+
OUTPUT_VARIABLE UNAME_RELEASE
148+
OUTPUT_STRIP_TRAILING_WHITESPACE)
149+
150+
if( NOT UNAME_RELEASE_RESULT EQUAL 0 )
151+
message(FATAL_ERROR "Failed to execute `(uname -r) 2> /dev/null`")
152+
endif( NOT UNAME_RELEASE_RESULT EQUAL 0 )
153+
154+
message(STATUS "Uname release: ${UNAME_RELEASE}")
155+
156+
string(REGEX REPLACE "${UNAME_RELEASE}$" "" RUSTC_HOST_TRIPLE "${LLVM_HOST_TRIPLE}")
157+
message(STATUS "Rust host triple: ${RUSTC_HOST_TRIPLE}")
149158

150159
list(APPEND RSLANG_BUILD_ARGS --set llvm.download-ci-llvm=false)
151160
list(APPEND RSLANG_BUILD_ARGS --target=${RUSTC_HOST_TRIPLE},assigner-unknown-unknown)
@@ -173,9 +182,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
173182
list(APPEND RSLANG_BUILD_ARGS --debuginfo-level=2)
174183
endif()
175184

176-
message("-- Configuring rslang")
185+
message(STATUS "Configuring rslang")
177186
execute_process(COMMAND ./configure ${RSLANG_BUILD_ARGS}
178-
COMMAND_ECHO STDOUT
179187
COMMAND_ERROR_IS_FATAL ANY
180188
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/libs/rslang)
181189

0 commit comments

Comments
 (0)