Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 407794. Nightlies should not override module-specific build settings. r=ted.mielczarek.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@241206 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sayrer%gmail.com
2007-12-14 03:27:45 +00:00
parent e4e2174d5c
commit 4e160af0f7
8 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/configure.in
View File

@@ -1593,7 +1593,7 @@ case "$target" in
*-darwin*)
MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
MOZ_OPTIMIZE_FLAGS="-O2"
_PEDANTIC=
CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
@@ -1716,6 +1716,7 @@ case "$target" in
*-*linux*)
TARGET_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
MOZ_OPTIMIZE_FLAGS="-Os -freorder-blocks -fno-reorder-functions"
MOZ_DEBUG_FLAGS="-g -fno-inline" # most people on linux use gcc/gdb,
# and that combo is not yet good at
# debugging inlined functions (even

11
mozilla/js/src/Makefile.in
View File

@@ -49,6 +49,17 @@ LIBRARY_NAME = mozjs
LIB_IS_C_ONLY = 1
GRE_MODULE = 1
ifdef GNU_CC
MODULE_OPTIMIZE_FLAGS = -Os
else
ifeq ($(OS_ARCH),SunOS)
MODULE_OPTIMIZE_FLAGS = -O
endif
ifeq ($(OS_ARCH),WINNT)
MODULE_OPTIMIZE_FLAGS = -O1
endif
endif
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
LIBRARY_NAME = js$(MOZ_BITS)$(VERSION_NUMBER)
RESFILE = js$(MOZ_BITS)40.res

2
mozilla/tools/tinderbox-configs/firefox/linux/CLOBBER
View File

@@ -1 +1 @@
clobbering to pick up follow-up fix for bug 406321
clobbering to check in build changes from bug 407794

6
mozilla/tools/tinderbox-configs/firefox/linux/mozconfig
View File

@@ -3,6 +3,9 @@
## uname: Linux fx-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 i686 i386 GNU/Linux
#
export CFLAGS="-gstabs+"
export CXXFLAGS="-gstabs+"
mk_add_options MOZ_CO_PROJECT=browser
mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging mozilla/tools/codesighs"
@@ -11,7 +14,8 @@ ac_add_options --enable-application=browser
ac_add_options --enable-update-channel=nightly
ac_add_options --enable-update-packaging
ac_add_options --enable-optimize="-Os -freorder-blocks -fno-reorder-functions -gstabs+"
# Don't add explicit optimize flags here, set them in configure.in, see bug 407794.
ac_add_options --enable-optimize
ac_add_options --disable-debug
ac_add_options --disable-tests
#not yet

3
mozilla/tools/tinderbox-configs/firefox/macosx/CLOBBER
View File

@@ -1 +1,2 @@
clobbering to pick up follow-up fix for bug 406321
Clobbering to land system changes in 407794.

7
mozilla/tools/tinderbox-configs/firefox/macosx/mozconfig
View File

@@ -3,6 +3,10 @@
## uname: Darwin bm-xserve08.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
#
# symbols for breakpad
export CFLAGS="-g -gfull"
export CXXFLAGS="-g -gfull"
. $topsrcdir/build/macosx/universal/mozconfig
mk_add_options MOZ_MAKE_FLAGS="-j4"
@@ -12,7 +16,8 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
ac_add_options --enable-application=browser
ac_add_options --enable-update-channel=nightly
ac_add_options --enable-optimize="-O2 -g"
# Don't add explicit optimize flags here, set them in configure.in, see bug 407794.
ac_add_options --enable-optimize
ac_add_options --disable-debug
ac_add_options --disable-tests
ac_add_options --enable-update-packaging

1
mozilla/tools/tinderbox-configs/firefox/win32/mozconfig
View File

@@ -9,7 +9,6 @@ mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
ac_add_options --enable-application=browser
ac_add_options --enable-update-channel=nightly
# Don't add explicit optimize flags here, set them in configure.in, see bug 407794.
ac_add_options --enable-optimize
ac_add_options --disable-debug
ac_add_options --disable-tests

7
mozilla/xpcom/io/Makefile.in
View File

@@ -50,6 +50,13 @@ MOZILLA_INTERNAL_API = 1
REQUIRES = string \
$(NULL)
# work around bug 408258
ifdef GNU_CC
ifneq ($(OS_ARCH), Darwin)
MODULE_OPTIMIZE_FLAGS = -Os -fno-strict-aliasing
endif
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
REQUIRES += macmorefiles
endif