Merge pull request 'Build: always copy Tor on reproducible build' (#335) from tobtoht/feather:docker_tor_openssl into master

Reviewed-on: https://git.wownero.com/feather/feather/pulls/335
This commit is contained in:
tobtoht
2021-02-06 03:58:32 +00:00
2 changed files with 7 additions and 2 deletions
+5 -1
View File
@@ -199,7 +199,11 @@ if(TOR_BIN)
# - linux: See `Dockerfile`
# - windows: See `Dockerfile.windows`
# - macos: taken from Tor Browser official release
set(TOR_COPY_CMD "cp -u ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
if(REPRODUCIBLE) # Always copy Tor when doing a reproducible build to prevent old versions from getting included
set(TOR_COPY_CMD "cp ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
else()
set(TOR_COPY_CMD "cp -u ${TOR_BIN} ${CMAKE_CURRENT_SOURCE_DIR}/src/assets/exec/tor")
endif()
message(STATUS "${TOR_COPY_CMD}")
execute_process(COMMAND bash -c "${TOR_COPY_CMD}" RESULT_VARIABLE ret)
if(ret EQUAL "1")