From 7148caeb916b8f9bde0bbce86a32f5daf6a1e6ad Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Fri, 19 Feb 2016 14:46:15 +1100 Subject: Add Windows specific waf support for MSYS2. Limit the compilers used to gcc and clang. Clang has not been tested. Users with MSVC install does not need to remove now. Force the os.sep path to the standard '\\' on Windows. The MSYS2 python sets it to '/' for internal project reasons. Doing this does cause waf problems when running configure so only do this for the build target. Closes #2583. --- wscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 5b79cd8..08fcb47 100644 --- a/wscript +++ b/wscript @@ -30,6 +30,8 @@ import os.path +import wafwindows + subdirs = ['rtemstoolkit', 'linkers', 'tester', @@ -79,17 +81,20 @@ def options(ctx): recurse(ctx) def init(ctx): + wafwindows.set_compilers() try: import waflib.Options import waflib.ConfigSet env = waflib.ConfigSet.ConfigSet() env.load(waflib.Options.lockfile) check_options(ctx, env.options['host']) - for sd in subdirs: - ctx.recurse(sd) + recurse(ctx) except: pass +def shutdown(ctx): + pass + def configure(ctx): try: ctx.load("doxygen", tooldir = 'waf-tools') @@ -113,6 +118,7 @@ def configure(ctx): recurse(ctx) def build(ctx): + wafwindows.set_os_sep() if os.path.exists('VERSION'): ctx.install_files('${PREFIX}/share/rtems/rtemstoolkit', ['VERSION']) recurse(ctx) -- cgit v1.2.3