From: machenbach@chromium.org <machenbach@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Thu, 5 Dec 2013 11:19:10 +0000 (+0000)
Subject: Pass -Goutput_dir=. to the make generator.
X-Git-Tag: upstream/4.7.83~11419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24912a794c00f48eec0e994fa72efb93da23bcdb;p=platform%2Fupstream%2Fv8.git

Pass -Goutput_dir=. to the make generator.

This makes it possible to remove the builddir_name hack added in r238632.

BUG=315004

Patch from Nico Weber <thakis@chromium.org>.

R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/98753003

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18257 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/build/gyp_v8 b/build/gyp_v8
index 92e6503..40c377d 100755
--- a/build/gyp_v8
+++ b/build/gyp_v8
@@ -167,5 +167,9 @@ if __name__ == '__main__':
   # Generate for the architectures supported on the given platform.
   gyp_args = list(args)
   if platform.system() == 'Linux':
+    # --generator-output defines where the Makefile goes.
     gyp_args.append('--generator-output=out')
+    # -Goutput_dir defines where the build output goes, relative to the
+    # Makefile. Set it to . so that the build output doesn't end up in out/out.
+    gyp_args.append('-Goutput_dir=.')
   run_gyp(gyp_args)