Changeset e2209fa in rtems-source-builder


Ignore:
Timestamp:
Oct 24, 2018, 10:37:49 AM (6 months ago)
Author:
Chris Johns <chrisj@…>
Branches:
master
Children:
0794cc3
Parents:
ceeb3be
git-author:
Chris Johns <chrisj@…> (10/24/18 10:37:49)
git-committer:
Chris Johns <chrisj@…> (10/24/18 10:43:18)
Message:

sb: Fix rtems-build-dep to handle various issues

  • Remove CR characters on Windows.
  • Force the compiler to output English so the pattern matching works.

Updates #3537.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • source-builder/sb/rtems-build-dep

    rceeb3be re2209fa  
    122122#
    123123if [ ${op} = "header" ]; then
    124     inc_paths=$(echo | ${compiler} ${includes} -xc -E -v - 2>&1 | \
     124    inc_paths=$(echo | LC_ALL=C ${compiler} ${includes} -xc -E -v - 2>&1 | tr -d '\r' | \
    125125               awk 'BEGIN {flag=0;} /starts here/{flag=1;next}/End/{flag=0}flag')
    126126    for p in ${inc_paths}
     
    147147        sep=':'
    148148    fi
    149     lib_paths_1=$(${compiler} -print-search-dirs 2>&1 | \
     149    lib_paths_1=$(LC_ALL=C ${compiler} -print-search-dirs 2>&1 | tr -d '\r' | \
    150150                      grep libraries | \
    151151                      sed -e 's/libraries:.*=//' | \
Note: See TracChangeset for help on using the changeset viewer.