|
@@ -2,7 +2,7 @@
|
|
|
# User Mike Hommey <mh+mozilla@glandium.org>
|
|
|
# Date 1545344724 0
|
|
|
# Node ID dca16fc55e60d74323807411fb441b4a6c60c97c
|
|
|
-# Parent f63a0d0975fd60658a402fa2ebaa47ae755eaee7
|
|
|
+# Parent c13d65ce127db2f7c18ea1e4ca866bd14b53e8bd
|
|
|
Bug 1515581 - Move RC and WINDRES to python configure. r=nalexander
|
|
|
|
|
|
Remove the version check for WINDRES, because, as per bug 454112, it
|
|
@@ -35,7 +35,7 @@ diff --git a/build/autoconf/toolchain.m4 b/build/autoconf/toolchain.m4
|
|
|
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
|
|
|
--- a/build/moz.configure/toolchain.configure
|
|
|
+++ b/build/moz.configure/toolchain.configure
|
|
|
-@@ -2096,8 +2096,19 @@ def make_shared_library(target, compiler
|
|
|
+@@ -2095,8 +2095,19 @@ def make_shared_library(target, compiler
|
|
|
return namespace(
|
|
|
mkshlib=cxx + flags + soname + output,
|
|
|
mkcshlib=cc + flags + soname + output,
|
|
@@ -130,7 +130,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
|
AC_DEFINE_UNQUOTED(_WIN32_IE,0x0800)
|
|
|
|
|
|
;;
|
|
|
-@@ -575,25 +554,23 @@ case "$target" in
|
|
|
+@@ -574,25 +553,23 @@ case "$target" in
|
|
|
CXXFLAGS="$CXXFLAGS -mieee"
|
|
|
;;
|
|
|
esac
|
|
@@ -156,7 +156,7 @@ diff --git a/js/src/old-configure.in b/js/src/old-configure.in
|
|
|
|
|
|
if test -z "$CLANG_CC"; then
|
|
|
# Use static libgcc and libstdc++
|
|
|
-@@ -1611,17 +1588,16 @@ dnl = Maintainer debug option (no --enab
|
|
|
+@@ -1602,17 +1579,16 @@ dnl = Maintainer debug option (no --enab
|
|
|
dnl =
|
|
|
dnl ========================================================
|
|
|
|
|
@@ -276,9 +276,9 @@ diff --git a/old-configure.in b/old-configure.in
|
|
|
LIBS="$LIBS -luuid -lusp10 -lgdi32 -lwinmm -lwsock32 -luserenv -lsecur32"
|
|
|
MOZ_FIX_LINK_PATHS=
|
|
|
|
|
|
- WIN32_CONSOLE_EXE_LDFLAGS=-mconsole
|
|
|
- WIN32_GUI_EXE_LDFLAGS=-mwindows
|
|
|
-@@ -3614,19 +3590,17 @@ dnl = Maintainer debug option (no --enab
|
|
|
+ MOZ_OPTIMIZE_FLAGS="-O1"
|
|
|
+
|
|
|
+@@ -3499,19 +3475,17 @@ dnl = Maintainer debug option (no --enab
|
|
|
dnl =
|
|
|
dnl ========================================================
|
|
|
|
|
@@ -298,7 +298,7 @@ diff --git a/old-configure.in b/old-configure.in
|
|
|
AC_SUBST(WARNINGS_AS_ERRORS)
|
|
|
AC_SUBST_LIST(WARNINGS_CFLAGS)
|
|
|
AC_SUBST_SET(MOZ_EXTENSIONS)
|
|
|
-@@ -4108,17 +4082,16 @@ if test -z "$direct_nspr_config"; then
|
|
|
+@@ -3986,17 +3960,16 @@ if test -z "$direct_nspr_config"; then
|
|
|
CFLAGS="$_SUBDIR_CFLAGS"
|
|
|
CPPFLAGS="$_SUBDIR_CPPFLAGS"
|
|
|
CXXFLAGS="$_SUBDIR_CXXFLAGS"
|
|
@@ -316,7 +316,7 @@ diff --git a/old-configure.in b/old-configure.in
|
|
|
# Run all configure scripts specified by a subconfigure
|
|
|
if test -n "$_subconfigure_subdir"; then
|
|
|
_save_srcdir="$srcdir"
|
|
|
-@@ -4142,17 +4115,16 @@ CXX="$_SUBDIR_CXX"
|
|
|
+@@ -4020,17 +3993,16 @@ CXX="$_SUBDIR_CXX"
|
|
|
CFLAGS="$_SUBDIR_CFLAGS"
|
|
|
CPPFLAGS="$_SUBDIR_CPPFLAGS"
|
|
|
CXXFLAGS="$_SUBDIR_CXXFLAGS"
|