From b14e2069ebccd4dc8667828e71da8d4afb7e94be Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Fri, 19 Sep 2014 12:58:16 +0300 Subject: [PATCH] build: store build.ninja outside build directory This preserves configuration options after a make clean (and also allows you to call ninja-build directly). --- .gitignore | 1 + Makefile | 4 ++-- configure.py | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 869752d5cc..dad6fa6d7b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .project .settings build +build.ninja \ No newline at end of file diff --git a/Makefile b/Makefile index e2e0b6ffe1..287067249b 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ out = build -all: $(out)/build.ninja +all: build.ninja @ninja-build -f $< -$(out)/build.ninja: +build.ninja: python3 configure.py clean: diff --git a/configure.py b/configure.py index 2c7530de6f..5c1568bbe0 100755 --- a/configure.py +++ b/configure.py @@ -55,7 +55,7 @@ args = arg_parser.parse_args() globals().update(vars(args)) outdir = 'build' -buildfile = outdir + '/build.ninja' +buildfile = 'build.ninja' os.makedirs(outdir, exist_ok = True) with open(buildfile, 'w') as f: f.write(textwrap.dedent('''\ @@ -94,5 +94,5 @@ with open(buildfile, 'w') as f: rule configure command = python3 configure.py $configure_args generator = 1 - build $builddir/build.ninja: configure | configure.py + build build.ninja: configure | configure.py '''))