diff options
author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 00:25:25 +0000 |
---|---|---|
committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-04 00:25:25 +0000 |
commit | 60222437a31765923a630cc4201398e697eb0c66 (patch) | |
tree | 68dab6d052f6cb2b3984c875ebcbfc357c0acc9f /o3d/gypbuild.py | |
parent | 7b9a0ea99e69b4207956c08355b36deb9d7e1026 (diff) | |
download | chromium_src-60222437a31765923a630cc4201398e697eb0c66.zip chromium_src-60222437a31765923a630cc4201398e697eb0c66.tar.gz chromium_src-60222437a31765923a630cc4201398e697eb0c66.tar.bz2 |
Linux: make gypbuild use make now that that's the default GYP generator.
TEST=build on Linux and ran trybots
BUG=none
Review URL: http://codereview.chromium.org/1833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/gypbuild.py')
-rwxr-xr-x | o3d/gypbuild.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/o3d/gypbuild.py b/o3d/gypbuild.py index 86ff0cd..785e187 100755 --- a/o3d/gypbuild.py +++ b/o3d/gypbuild.py @@ -181,20 +181,16 @@ class GypBuilder(object): def GetSolutionPath(self): """Gets the solution path.""" - return '%s_main.scons' % GypBuilder.base_name + return '%s.Makefile' % GypBuilder.base_name def CleanTargets(self, targets, options): """Cleans the targets.""" - solution = self.GetSolutionPath() - self.Execute(['hammer', - '-f', solution, - '--clean']) + print "clean not implemented for this platform." def Dobuild(self, targets, options): """Builds the specifed targets.""" solution = self.GetSolutionPath() - self.Execute(['hammer', - '-f', solution]) + self.Execute(['make', '-f', solution]) # Use "o3d" for chrome only build? base_name = "o3d_all" |