Skip to content

Commit 0065ead

Browse files
committed
contrib: guix: Remove ssp spec file hack
This hack is no longer needed after fixing our cross-compilation search paths.
1 parent 0093a58 commit 0065ead

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

contrib/guix/libexec/build.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,17 +136,10 @@ DISTNAME="$(basename "$SOURCEDIST" '.tar.gz')"
136136
# Binary Tarball Building #
137137
###########################
138138

139-
# Create a spec file to normalize ssp linking behaviour
140-
spec_file="$(mktemp)"
141-
cat << EOF > "$spec_file"
142-
*link_ssp:
143-
%{fstack-protector|fstack-protector-all|fstack-protector-strong|fstack-protector-explicit:}
144-
EOF
145-
146139
# Similar flags to Gitian
147140
CONFIGFLAGS="--enable-glibc-back-compat --enable-reduce-exports --disable-bench --disable-gui-tests"
148-
HOST_CFLAGS="-O2 -g -specs=${spec_file} -ffile-prefix-map=${PWD}=."
149-
HOST_CXXFLAGS="-O2 -g -specs=${spec_file} -ffile-prefix-map=${PWD}=."
141+
HOST_CFLAGS="-O2 -g -ffile-prefix-map=${PWD}=."
142+
HOST_CXXFLAGS="-O2 -g -ffile-prefix-map=${PWD}=."
150143
HOST_LDFLAGS="-Wl,--as-needed -Wl,--dynamic-linker=$glibc_dynamic_linker -static-libstdc++"
151144

152145
# Make $HOST-specific native binaries from depends available in $PATH

0 commit comments

Comments
 (0)