Changeset 0382b68 in rtems-tools for rtemstoolkit


Ignore:
Timestamp:
Oct 18, 2015, 8:19:08 AM (4 years ago)
Author:
Chris Johns <chrisj@…>
Branches:
4.10, master
Children:
bd94415
Parents:
2f11c36
git-author:
Chris Johns <chrisj@…> (10/18/15 08:19:08)
git-committer:
Chris Johns <chrisj@…> (10/18/15 22:06:49)
Message:

Fix Windows build issues.

Fix biulding the mmap Windows code.
Fix installing the files for Windows.

Location:
rtemstoolkit
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • rtemstoolkit/elftoolchain/libelf/mmap_win32.c

    r2f11c36 r0382b68  
    11/*-
    2  * Copyright (c) 2011 Chris Johns <chrisj@rtems.org>
     2 * Copyright (c) 2011, 2015 Chris Johns <chrisj@rtems.org>
    33 * All rights reserved.
    44 *
     
    4040#include <errno.h>
    4141#include <stdint.h>
     42#include <io.h>
    4243#include <windows.h>
    4344
  • rtemstoolkit/wscript

    r2f11c36 r0382b68  
     1#
     2# RTEMS Tools Project (http://www.rtems.org/)
     3# Copyright 2014, 2015 Chris Johns (chrisj@rtems.org)
     4# All rights reserved.
     5#
     6# This file is part of the RTEMS Tools package in 'rtems-tools'.
     7#
     8# Redistribution and use in source and binary forms, with or without
     9# modification, are permitted provided that the following conditions are met:
     10#
     11# 1. Redistributions of source code must retain the above copyright notice,
     12# this list of conditions and the following disclaimer.
     13#
     14# 2. Redistributions in binary form must reproduce the above copyright notice,
     15# this list of conditions and the following disclaimer in the documentation
     16# and/or other materials provided with the distribution.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     19# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     20# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     21# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
     22# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     23# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     24# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     25# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     26# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     27# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     28# POSSIBILITY OF SUCH DAMAGE.
     29#
     30
    131#
    232# RTEMS Toolkit build script.
     
    2353    conf_libiberty(conf)
    2454    conf_libelf(conf)
     55
     56    conf.find_program('m4')
    2557
    2658    conf.check(header_name='sys/wait.h',  features = 'c', mandatory = False)
     
    139171def bld_libelf(bld, conf):
    140172    libelf = 'elftoolchain/libelf/'
    141 
    142     #
    143     # Work around the ${SRC} having Windows slashes which the MSYS m4 does not
    144     # understand.
    145     #
    146     if sys.platform == 'win32':
    147         m4_rule = 'type ${SRC} | m4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + '> ${TGT}"'
    148     else:
    149         m4_rule = 'm4 -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}'
     173    m4_rule = '${M4} -D SRCDIR=../rtemstoolkit/' + libelf[:-1] + ' ${SRC} > ${TGT}'
    150174    if bld.env.DEST_OS == 'win32':
    151175        includes = ['win32']
Note: See TracChangeset for help on using the changeset viewer.