From 2c0d00840d09ce6d8f2b8615c9682ce4dfbfdb9d Mon Sep 17 00:00:00 2001 From: Bert Belder Date: Sun, 2 Sep 2018 20:00:25 +0200 Subject: =?UTF-8?q?tools/build:=20skip=20build=20path=20detection=20when?= =?UTF-8?q?=20given=20'-C=20=C2=ABdir=C2=BB'=20ninja=20arg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/build.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tools/build.py') diff --git a/tools/build.py b/tools/build.py index 978b70a36..9de84f541 100755 --- a/tools/build.py +++ b/tools/build.py @@ -1,20 +1,20 @@ #!/usr/bin/env python # Copyright 2018 the Deno authors. All rights reserved. MIT license. +from __future__ import print_function import os import sys -from os.path import join import third_party -from util import root_path, run, run_output, build_path +from util import build_path, run third_party.fix_symlinks() -print "DENO_BUILD_PATH:", build_path() -if not os.path.isdir(build_path()): - print "DENO_BUILD_PATH does not exist. Run tools/setup.py" - sys.exit(1) -os.chdir(build_path()) - ninja_args = sys.argv[1:] +if not "-C" in ninja_args: + if not os.path.isdir(build_path()): + print("Build directory '%s' does not exist." % build_path(), + "Run tools/setup.py") + sys.exit(1) + ninja_args = ["-C", build_path()] + ninja_args run([third_party.ninja_path] + ninja_args, env=third_party.google_env(), -- cgit v1.2.3