diff options
| author | Carl Dong <contact@carldong.me> | 2019-09-05 14:45:03 -0400 |
|---|---|---|
| committer | Carl Dong <contact@carldong.me> | 2019-09-05 14:50:56 -0400 |
| commit | 0065ead5ebdad9f743d89ee2558c93253a597967 (patch) | |
| tree | c0b6a2dddd00ba5bafd178e20721518383ef907a /contrib | |
| parent | 0093a5869a30797ccb139d0cb5a0427d3f3c2d94 (diff) | |
| download | bitcoin-0065ead5ebdad9f743d89ee2558c93253a597967.tar.xz | |
contrib: guix: Remove ssp spec file hack
This hack is no longer needed after fixing our cross-compilation search
paths.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/guix/libexec/build.sh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 25d0582d16..ee207a957c 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -136,17 +136,10 @@ DISTNAME="$(basename "$SOURCEDIST" '.tar.gz')" # Binary Tarball Building # ########################### -# Create a spec file to normalize ssp linking behaviour -spec_file="$(mktemp)" -cat << EOF > "$spec_file" -*link_ssp: -%{fstack-protector|fstack-protector-all|fstack-protector-strong|fstack-protector-explicit:} -EOF - # Similar flags to Gitian CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests" -HOST_CFLAGS="-O2 -g -specs=${spec_file} -ffile-prefix-map=${PWD}=." -HOST_CXXFLAGS="-O2 -g -specs=${spec_file} -ffile-prefix-map=${PWD}=." +HOST_CFLAGS="-O2 -g -ffile-prefix-map=${PWD}=." +HOST_CXXFLAGS="-O2 -g -ffile-prefix-map=${PWD}=." HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$glibc_dynamic_linker -static-libstdc++" # Make $HOST-specific native binaries from depends available in $PATH |