Unverified Commit b66d7da8 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 23231: Disable STL Wrappers for Win64 build for now

Due to bug https://bugzilla.mozilla.org/show_bug.cgi?id=1392604 we disable
STL wrappers for now. For some reason only 64bit Windows builds are affected.
Thus we restrict the disabling only to them leaving all other targets
unaffected.
parent 4035a8c3
From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@torproject.org>
Date: Sat, 12 Aug 2017 22:00:13 +0200
Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows
Workaround for:
https://bugzilla.mozilla.org/show_bug.cgi?id=1392604
---
old-configure.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/old-configure.in b/old-configure.in
index f5a2f05..e247551 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1338,7 +1338,7 @@ MOZ_CXX11
AC_LANG_C
case "${OS_TARGET}" in
-Darwin)
+WINNT|Darwin)
;;
*)
STL_FLAGS="-I${DIST}/stl_wrappers"
...@@ -86,6 +86,10 @@ fi ...@@ -86,6 +86,10 @@ fi
export CC='gcc -m32' export CC='gcc -m32'
[% END -%] [% END -%]
[% IF c("var/windows-x86_64") %]
patch -p1 < $rootdir/STL_win64.patch
[% END -%]
rm -f configure rm -f configure
rm -f js/src/configure rm -f js/src/configure
make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts" make -f client.mk configure CONFIGURE_ARGS="--with-tor-browser-version=[% c("var/torbrowser_version") %] --with-distribution-id=org.torproject --enable-update-channel=[% c("var/torbrowser_update_channel") %] --enable-bundled-fonts"
......
...@@ -93,3 +93,5 @@ input_files: ...@@ -93,3 +93,5 @@ input_files:
- project: yasm - project: yasm
name: yasm name: yasm
enable: '[% c("var/windows") %]' enable: '[% c("var/windows") %]'
- filename: STL_win64.patch
enable: '[% c("var/windows-x86_64") %]'
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