Hello cprince,
I'd like you to do a code review. Please execute
g4 diff -c 10876769
or point your web browser to
http://mondrian/10876769
to review the following code:
Change 10876769 by nigel...@nigeltao-srcmacgears1 on 2009/04/21 18:37:07
*pending*
Unbreak Firefox2/Mac.
This was broken by OCL 10624727 "Build fixes for 64-bit Ubuntu
Hardy (GCC 4.2)". That CL assumed that if $ARCH was not "x86_64",
then it was "i386", but on the Mac, it is "i386+ppc".
PRESUBMIT=passed
R=cprince
[email protected]
DELTA=1 (0 added, 0 deleted, 1 changed)
OCL=10876769
Affected files ...
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#106 edit
1 delta lines: 0 added, 0 deleted, 1 changed
If you can't do the review, please let me know as soon as possible. During
your review, please ensure that all new code has corresponding unit tests and
that existing unit tests are updated appropriately. Visit
http://www/eng/code_review.html for more information.
This is a semiautomated message from "g4 mail". Complaints or suggestions?
Mail [email protected].
Change 10876769 by nigel...@nigeltao-srcmacgears1 on 2009/04/21 18:37:07
*pending*
Unbreak Firefox2/Mac.
This was broken by OCL 10624727 "Build fixes for 64-bit Ubuntu
Hardy (GCC 4.2)". That CL assumed that if $ARCH was not "x86_64",
then it was "i386", but on the Mac, it is "i386+ppc".
Affected files ...
... //depot/googleclient/gears/opensource/gears/tools/rules.mk#106 edit
==== //depot/googleclient/gears/opensource/gears/tools/rules.mk#106 -
/Users/nigeltao/devel/srcmacgears1/googleclient/gears/opensource/gears/tools/rules.mk
====
# action=edit type=text
--- googleclient/gears/opensource/gears/tools/rules.mk 2009-04-21
17:56:21.000000000 +1000
+++ googleclient/gears/opensource/gears/tools/rules.mk 2009-04-21
18:32:45.000000000 +1000
@@ -1206,7 +1206,7 @@
cp -R $(COMMON_OUTDIR)/genfiles/i18n/*
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/chrome/chromeFiles/locale
cp $(FF3_MODULE_TYPELIB)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components
cp $(FF3_MODULE_DLL)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components/$(DLL_PREFIX)$(MODULE)$(DLL_SUFFIX)
-ifeq ($(ARCH),i386)
+ifneq ($(ARCH),x86_64)
cp $(FF2_MODULE_DLL)
$(INSTALLERS_OUTDIR)/$(INSTALLER_BASE_NAME)/components/$(DLL_PREFIX)$(MODULE)_ff2$(DLL_SUFFIX)
endif
ifeq ($(OS),osx)
