diff options
author | Chris Johns <chrisj@rtems.org> | 2015-10-18 19:19:08 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2015-10-19 09:06:49 +1100 |
commit | 0382b6863be01ad365d7ae272b61cfef4870f631 (patch) | |
tree | e015eda07f1f15bf1223461aa6c9ac85d482392f /rtemstoolkit/wscript | |
parent | Always provide the argument size defines. (diff) | |
download | rtems-tools-0382b6863be01ad365d7ae272b61cfef4870f631.tar.bz2 |
Fix Windows build issues.
Fix biulding the mmap Windows code.
Fix installing the files for Windows.
Diffstat (limited to 'rtemstoolkit/wscript')
-rw-r--r-- | rtemstoolkit/wscript | 42 |
1 files changed, 33 insertions, 9 deletions
diff --git a/rtemstoolkit/wscript b/rtemstoolkit/wscript index 229deeb..9e9f047 100644 --- a/rtemstoolkit/wscript +++ b/rtemstoolkit/wscript @@ -1,4 +1,34 @@ # +# RTEMS Tools Project (http://www.rtems.org/) +# Copyright 2014, 2015 Chris Johns (chrisj@rtems.org) +# All rights reserved. +# +# This file is part of the RTEMS Tools package in 'rtems-tools'. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +# # RTEMS Toolkit build script. # import sys @@ -23,6 +53,8 @@ def configure(conf): conf_libiberty(conf) conf_libelf(conf) + conf.find_program('m4') + conf.check(header_name='sys/wait.h', features = 'c', mandatory = False) conf.check_cc(function_name='kill', header_name="signal.h", features = 'c', mandatory = False) @@ -138,15 +170,7 @@ def conf_libelf(conf): def bld_libelf(bld, conf): libelf = 'elftoolchain/libelf/' - - # - # Work around the ${SRC} having Windows slashes which the MSYS m4 does not - # understand. - # - if sys.platform == 'win32': - m4_rule = 'type ${SRC} | m4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + '> ${TGT}"' - else: - m4_rule = 'm4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}' + m4_rule = '${M4} -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}' if bld.env.DEST_OS == 'win32': includes = ['win32'] else: |