Revert 25818 - Explicitly only use xmldummy_mac.cc on Mac systems, since libx...

Revert 25818 - Explicitly only use xmldummy_mac.cc on Mac systems, since libxml (as
thirdparty code) doesn't exclude _mac.cc files automatically.
BUG=none
TEST=build without warning
Review URL: http://codereview.chromium.org/194062

TBR=sgk@google.com

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=25823

[Kasper Lund, 2009-09-10 05:31:14]

Hey Steven,

This mornings I saw this warning when building the Linux version of
Chromium using the SCons-based build:

--------------------
scons: warning: Two different environments were specified for target
<path>/src/sconsbuild/Debug/obj/libxml/xmldummy_mac.o,
	but they appear to have the same action: $CXX -o $TARGET -c $CXXFLAGS
$CCFLAGS $_CCCOMCOM $SOURCES
File "<path>/src/third_party/libxml/xmllint.scons", line 397, in <module>
--------------------

Could it be related to this change?

Cheers,
Kasper

On Thu, Sep 10, 2009 at 2:14 AM,  <sgk@chromium.org> wrote:
>
> Reviewers: sgk_google.com,
>
> Description:
> Revert 25818 - Explicitly only use xmldummy_mac.cc on Mac systems, since
> libxml
> (as
> thirdparty code) doesn't exclude _mac.cc files automatically.
> BUG=3Dnone
> TEST=3Dbuild without warning
> Review URL: http://codereview.chromium.org/194062
>
> TBR=3Dsgk@google.com
>
> Please review this at http://codereview.chromium.org/201074
>
> SVN Base: svn://chrome-svn/chrome/trunk/src/
>
> Affected files:
> =A0M =A0 =A0 third_party/libxml/libxml.gyp
>
>
> Index: third_party/libxml/libxml.gyp
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- third_party/libxml/libxml.gyp =A0 =A0 =A0 (revision 25822)
> +++ third_party/libxml/libxml.gyp =A0 =A0 =A0 (working copy)
> @@ -189,6 +189,7 @@
> =A0 =A0 =A0 'type': 'executable',
> =A0 =A0 =A0 'sources': [
> =A0 =A0 =A0 =A0 'xmlcatalog.c',
> + =A0 =A0 =A0 =A0'xmldummy_mac.cc',
> =A0 =A0 =A0 ],
> =A0 =A0 =A0 'include_dirs': [
> =A0 =A0 =A0 =A0 '<(os_include)',
> @@ -205,11 +206,6 @@
> =A0 =A0 =A0 =A0 =A0 =A0 ],
> =A0 =A0 =A0 =A0 =A0 },
> =A0 =A0 =A0 =A0 }],
> - =A0 =A0 =A0 =A0['OS=3D=3D"mac"', {
> - =A0 =A0 =A0 =A0 =A0'sources': [
> - =A0 =A0 =A0 =A0 =A0 =A0'xmldummy_mac.cc',
> - =A0 =A0 =A0 =A0 =A0],
> - =A0 =A0 =A0 =A0}],
> =A0 =A0 =A0 ],
> =A0 =A0 },
> =A0 =A0 {
> @@ -217,6 +213,7 @@
> =A0 =A0 =A0 'type': 'executable',
> =A0 =A0 =A0 'sources': [
> =A0 =A0 =A0 =A0 'xmllint.c',
> + =A0 =A0 =A0 =A0'xmldummy_mac.cc',
> =A0 =A0 =A0 ],
> =A0 =A0 =A0 'include_dirs': [
> =A0 =A0 =A0 =A0 '<(os_include)',
> @@ -234,11 +231,6 @@
> =A0 =A0 =A0 =A0 =A0 =A0 ],
> =A0 =A0 =A0 =A0 =A0 },
> =A0 =A0 =A0 =A0 }],
> - =A0 =A0 =A0 =A0['OS=3D=3D"mac"', {
> - =A0 =A0 =A0 =A0 =A0'sources': [
> - =A0 =A0 =A0 =A0 =A0 =A0'xmldummy_mac.cc',
> - =A0 =A0 =A0 =A0 =A0],
> - =A0 =A0 =A0 =A0}],
> =A0 =A0 =A0 ],
> =A0 =A0 },
> =A0 ],
>
>
>

[sgk1, 2009-09-10 06:31:42]

Hi Kasper--
It's related to the original cutover to icu42.  The change I submitted was
an attempt to fix the warning, but it outright broke the Linux build because
it turns out the xmldummy_mac.cc file is necessary on Linux, too.

I'll take a run at fixing it again tomorrow morning.  In the meantime, the
warning isn't actually causing it to build incorrectly.

        --SK

On Wed, Sep 9, 2009 at 10:30 PM, Kasper Lund <kasperl@chromium.org> wrote:

> Hey Steven,
>
> This mornings I saw this warning when building the Linux version of
> Chromium using the SCons-based build:
>
> --------------------
> scons: warning: Two different environments were specified for target
> <path>/src/sconsbuild/Debug/obj/libxml/xmldummy_mac.o,
>        but they appear to have the same action: $CXX -o $TARGET -c
> $CXXFLAGS
> $CCFLAGS $_CCCOMCOM $SOURCES
> File "<path>/src/third_party/libxml/xmllint.scons", line 397, in <module>
> --------------------
>
> Could it be related to this change?
>
> Cheers,
> Kasper
>
> On Thu, Sep 10, 2009 at 2:14 AM,  <sgk@chromium.org> wrote:
> >
> > Reviewers: sgk_google.com,
> >
> > Description:
> > Revert 25818 - Explicitly only use xmldummy_mac.cc on Mac systems, since
> > libxml
> > (as
> > thirdparty code) doesn't exclude _mac.cc files automatically.
> > BUG=none
> > TEST=build without warning
> > Review URL: http://codereview.chromium.org/194062
> >
> > TBR=sgk@google.com
> >
> > Please review this at http://codereview.chromium.org/201074
> >
> > SVN Base: svn://chrome-svn/chrome/trunk/src/
> >
> > Affected files:
> >  M     third_party/libxml/libxml.gyp
> >
> >
> > Index: third_party/libxml/libxml.gyp
> > ===================================================================
> > --- third_party/libxml/libxml.gyp       (revision 25822)
> > +++ third_party/libxml/libxml.gyp       (working copy)
> > @@ -189,6 +189,7 @@
> >       'type': 'executable',
> >       'sources': [
> >         'xmlcatalog.c',
> > +        'xmldummy_mac.cc',
> >       ],
> >       'include_dirs': [
> >         '<(os_include)',
> > @@ -205,11 +206,6 @@
> >             ],
> >           },
> >         }],
> > -        ['OS=="mac"', {
> > -          'sources': [
> > -            'xmldummy_mac.cc',
> > -          ],
> > -        }],
> >       ],
> >     },
> >     {
> > @@ -217,6 +213,7 @@
> >       'type': 'executable',
> >       'sources': [
> >         'xmllint.c',
> > +        'xmldummy_mac.cc',
> >       ],
> >       'include_dirs': [
> >         '<(os_include)',
> > @@ -234,11 +231,6 @@
> >             ],
> >           },
> >         }],
> > -        ['OS=="mac"', {
> > -          'sources': [
> > -            'xmldummy_mac.cc',
> > -          ],
> > -        }],
> >       ],
> >     },
> >   ],
> >
> >
> >
>