Skip to content

Commit

Permalink
Auto merge of zcash#1577 - radix42:v1.0.0-rc1-gitian, r=daira
Browse files Browse the repository at this point in the history
V1.0.0 rc1 gitian

Removes indeterminism from gitian builds: underlying processor instruction set variant of x86_64 was being detected by the libgmp autoconf process, which caused differences in libgmp and libsnark
  • Loading branch information
zkbot committed Oct 20, 2016
2 parents f905265 + ed928f4 commit 90031e1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion depends/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ NO_WALLET ?=
NO_UPNP ?=
FALLBACK_DOWNLOAD_PATH ?= https://z.cash/depends-sources

BUILD = $(shell ./config.guess)
BUILD ?= $(shell ./config.guess)
HOST ?= $(BUILD)
PATCHES_PATH = $(BASEDIR)/patches
BASEDIR = $(CURDIR)
Expand Down
2 changes: 1 addition & 1 deletion depends/packages/libgmp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $(package)_dependencies=
$(package)_config_opts=--enable-cxx --disable-shared

define $(package)_config_cmds
$($(package)_autoconf)
$($(package)_autoconf) --host=$(host) --build=$(build)
endef

define $(package)_build_cmds
Expand Down
4 changes: 2 additions & 2 deletions zcutil/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
# BUG: parameterize the platform/host directory:
PREFIX="$(pwd)/depends/x86_64-unknown-linux-gnu/"

make "$@" -C ./depends/ V=1 NO_QT=1
HOST=x86_64-unknown-linux-gnu BUILD=x86_64-unknown-linux-gnu make "$@" -C ./depends/ V=1 NO_QT=1
./autogen.sh
./configure --prefix="${PREFIX}" --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
./configure --prefix="${PREFIX}" --host=x86_64-unknown-linux-gnu --build=x86_64-unknown-linux-gnu --with-gui=no "$HARDENING_ARG" "$LCOV_ARG" CXXFLAGS='-fwrapv -fno-strict-aliasing -Werror -g'
make "$@" V=1

0 comments on commit 90031e1

Please sign in to comment.