Skip to content

Commit ac85e81

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 (bitcoin#6900). However, it should no longer be required, as we have switched to Bionic (bitcoin#13171), and that has a far newer version of binutils. binutils patch: https://sourceware.org/bugzilla/show_bug.cgi?id=16192
1 parent e00ecb3 commit ac85e81

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -73,35 +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
79-
for i in $HOSTS; do
80-
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
88-
for prog in gcc g++; do
89-
echo '#!/usr/bin/env bash' > ${WRAP_DIR}/${i}-${prog}
90-
echo "REAL=\`which -a ${i}-${prog}-posix | grep -v ${WRAP_DIR}/${i}-${prog} | head -1\`" >> ${WRAP_DIR}/${i}-${prog}
91-
echo 'export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1' >> ${WRAP_DIR}/${i}-${prog}
92-
echo "export FAKETIME=\"$1\"" >> ${WRAP_DIR}/${i}-${prog}
93-
echo "export COMPILER_PATH=${WRAP_DIR}/${i}" >> ${WRAP_DIR}/${i}-${prog}
94-
echo "\$REAL \$@" >> $WRAP_DIR/${i}-${prog}
95-
chmod +x ${WRAP_DIR}/${i}-${prog}
96-
done
97-
done
98-
}
99-
10076
# Faketime for depends so intermediate results are comparable
10177
export PATH_orig=${PATH}
10278
create_global_faketime_wrappers "2000-01-01 12:00:00"
10379
create_per-host_faketime_wrappers "2000-01-01 12:00:00"
104-
create_per-host_linker_wrapper "2000-01-01 12:00:00"
10580
export PATH=${WRAP_DIR}:${PATH}
10681
10782
cd bitcoin
@@ -115,7 +90,6 @@ script: |
11590
export PATH=${PATH_orig}
11691
create_global_faketime_wrappers "${REFERENCE_DATETIME}"
11792
create_per-host_faketime_wrappers "${REFERENCE_DATETIME}"
118-
create_per-host_linker_wrapper "${REFERENCE_DATETIME}"
11993
export PATH=${WRAP_DIR}:${PATH}
12094
12195
# Create the release tarball using (arbitrarily) the first host

0 commit comments

Comments
 (0)