Verified Commit effde40c authored by boklm's avatar boklm
Browse files

Merge remote-tracking branch 'gk/bug_29013_v5'

parents 5d8507dd 562fe8f1
...@@ -15,6 +15,9 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %] ...@@ -15,6 +15,9 @@ mkdir -p [% dest_dir _ '/' _ c('filename') %]
mkdir -p $HOME mkdir -p $HOME
WINEROOT=$HOME/.wine/drive_c WINEROOT=$HOME/.wine/drive_c
wine wineboot -i wine wineboot -i
# Setting up stack protector support
tar -C /var/tmp/dist -xf [% c('input_files_by_name/mingw-w64') %]
cp /var/tmp/dist/mingw-w64/gcclibs/{libssp.a,libssp_nonshared.a} /var/tmp/dist/mingw-w64-clang/[% c("arch") %]-w64-mingw32/lib/
[% END -%] [% END -%]
tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]
......
...@@ -159,6 +159,9 @@ input_files: ...@@ -159,6 +159,9 @@ input_files:
- project: fxc2 - project: fxc2
name: fxc2 name: fxc2
enable: '[% c("var/windows") %]' enable: '[% c("var/windows") %]'
- name: mingw-w64
project: mingw-w64
enable: '[% c("var/windows") %]'
- filename: abicheck.cc - filename: abicheck.cc
enable: '[% c("var/linux") %]' enable: '[% c("var/linux") %]'
- filename: start-firefox - filename: start-firefox
......
...@@ -56,7 +56,9 @@ cd /var/tmp/build/gcc ...@@ -56,7 +56,9 @@ cd /var/tmp/build/gcc
make -j[% c("buildconf/num_procs") %] make -j[% c("buildconf/num_procs") %]
make install make install
mkdir -p $distdir/gcclibs mkdir -p $distdir/gcclibs
cp [% c("arch") %]-w64-mingw32/libssp/.libs/libssp-0.dll $distdir/gcclibs # We compile libssp both for being used dynamically (in tor) and statically (in
# firefox).
cp [% c("arch") %]-w64-mingw32/libssp/.libs/libssp* $distdir/gcclibs
cp [% c("arch") %]-w64-mingw32/libgcc/shlib/[% c("var/libgcc_dll") %] $distdir/gcclibs cp [% c("arch") %]-w64-mingw32/libgcc/shlib/[% c("var/libgcc_dll") %] $distdir/gcclibs
cd /var/tmp/dist cd /var/tmp/dist
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment