Skip to content

Commit bd3f5a9

Browse files
committed
build: remove mingw linker workaround from win gitian descriptor
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. binutils patch: https://sourceware.org/bugzilla/show_bug.cgi?id=16192
1 parent 13377b7 commit bd3f5a9

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
@@ -73,18 +73,10 @@ script: |
7373
done
7474
}
7575
76-
function create_per-host_linker_wrapper {
77-
# This is only needed for trusty, as the mingw linker leaks a few bytes of
78-
# heap, causing non-determinism. See discussion in https://github.com/bitcoin/bitcoin/pull/6900
76+
function create_per-host_compiler_wrapper {
77+
# -posix variant is required for c++11 threading.
7978
for i in $HOSTS; do
8079
mkdir -p ${WRAP_DIR}/${i}
81-
for prog in collect2; do
82-
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}/${prog}
83-
REAL=$(${i}-gcc -print-prog-name=${prog})
84-
echo "export MALLOC_PERTURB_=255" >> ${WRAP_DIR}/${i}/${prog}
85-
echo "${REAL} \$@" >> $WRAP_DIR/${i}/${prog}
86-
chmod +x ${WRAP_DIR}/${i}/${prog}
87-
done
8880
for prog in gcc g++; do
8981
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
9082
echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
@@ -101,7 +93,7 @@ script: |
10193
export PATH_orig=${PATH}
10294
create_global_faketime_wrappers "2000-01-01 12:00:00"
10395
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
104-
create_per-host_linker_wrapper "2000-01-01 12:00:00"
96+
create_per-host_compiler_wrapper "2000-01-01 12:00:00"
10597
export PATH=${WRAP_DIR}:${PATH}
10698
10799
cd bitcoin
@@ -115,7 +107,7 @@ script: |
115107
export PATH=${PATH_orig}
116108
create_global_faketime_wrappers "${REFERENCE_DATETIME}"
117109
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
118-
create_per-host_linker_wrapper "${REFERENCE_DATETIME}"
110+
create_per-host_compiler_wrapper "${REFERENCE_DATETIME}"
119111
export PATH=${WRAP_DIR}:${PATH}
120112
121113
# Create the release tarball using (arbitrarily) the first host

0 commit comments

Comments
 (0)