Skip to content

Commit 4765b91

Browse files
author
MarcoFalke
committed
Merge #16667: build: remove mingw linker workaround from win gitian descriptor
bd3f5a9 build: remove mingw linker workaround from win gitian descriptor (fanquake) Pull request description: This workaround was added as part of the switch to gitian building using Ubuntu 14.04 (#6900). However, it should no longer be required, as we have switched to Bionic (#13171) and that has a far newer version of binutils. Original discussion: bitcoin/bitcoin#6900 binutils patch: https://sourceware.org/bugzilla/show_bug.cgi?id=16192 ACKs for top commit: MarcoFalke: ACK bd3f5a9 theuni: ACK bd3f5a9 laanwj: ACK bd3f5a9 Tree-SHA512: 01a5789994decf8cdedf7aaa0a449d2100a77e2e6b422d6b9dd5a4ac3e2e0b538c3d43aae4a1c3713614782f3c6b09d8d8bb21c20e86ce3c1734183dedd02d0c
2 parents d882f63 + bd3f5a9 commit 4765b91

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,10 @@ script: |
7272
done
7373
}
7474
75-
function create_per-host_linker_wrapper {
76-
# This is only needed for trusty, as the mingw linker leaks a few bytes of
77-
# heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900
75+
function create_per-host_compiler_wrapper {
76+
# -posix variant is required for c++11 threading.
7877
for i in $HOSTS; do
7978
mkdir -p ${WRAP_DIR}/${i}
80-
for prog in collect2; do
81-
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}/${prog}
82-
REAL=$(${i}-gcc -print-prog-name=${prog})
83-
echo "export MALLOC_PERTURB_=255" >> ${WRAP_DIR}/${i}/${prog}
84-
echo "${REAL} \$@" >> $WRAP_DIR/${i}/${prog}
85-
chmod +x ${WRAP_DIR}/${i}/${prog}
86-
done
8779
for prog in gcc g++; do
8880
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
8981
echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
@@ -100,7 +92,7 @@ script: |
10092
export PATH_orig=${PATH}
10193
create_global_faketime_wrappers "2000-01-01 12:00:00"
10294
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
103-
create_per-host_linker_wrapper "2000-01-01 12:00:00"
95+
create_per-host_compiler_wrapper "2000-01-01 12:00:00"
10496
export PATH=${WRAP_DIR}:${PATH}
10597
10698
cd bitcoin
@@ -114,7 +106,7 @@ script: |
114106
export PATH=${PATH_orig}
115107
create_global_faketime_wrappers "${REFERENCE_DATETIME}"
116108
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
117-
create_per-host_linker_wrapper "${REFERENCE_DATETIME}"
109+
create_per-host_compiler_wrapper "${REFERENCE_DATETIME}"
118110
export PATH=${WRAP_DIR}:${PATH}
119111
120112
# Create the release tarball using (arbitrarily) the first host

0 commit comments

Comments
 (0)