diff options
| author | Chris Johns <chrisj@rtems.org> | 2018-10-24 21:37:49 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2018-10-24 21:43:18 +1100 |
| commit | e2209fa1531d4e413e0b9ee425acdf0ae7d8f7f4 (patch) | |
| tree | 2c44e993451af017306b37b3cfca642993a4debc /source-builder | |
| parent | sb: Convert any unicode macro values to a string in __str__. (diff) | |
| download | rtems-source-builder-e2209fa1531d4e413e0b9ee425acdf0ae7d8f7f4.tar.bz2 | |
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.
Diffstat (limited to 'source-builder')
| -rwxr-xr-x | source-builder/sb/rtems-build-dep | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source-builder/sb/rtems-build-dep b/source-builder/sb/rtems-build-dep index 18359d7..0a49e70 100755 --- a/source-builder/sb/rtems-build-dep +++ b/source-builder/sb/rtems-build-dep @@ -121,7 +121,7 @@ fi # Header file. # if [ ${op} = "header" ]; then - inc_paths=$(echo | ${compiler} ${includes} -xc -E -v - 2>&1 | \ + inc_paths=$(echo | LC_ALL=C ${compiler} ${includes} -xc -E -v - 2>&1 | tr -d '\r' | \ awk 'BEGIN {flag=0;} /starts here/{flag=1;next}/End/{flag=0}flag') for p in ${inc_paths} do @@ -146,7 +146,7 @@ if [ ${op} = "library" ]; then else sep=':' fi - lib_paths_1=$(${compiler} -print-search-dirs 2>&1 | \ + lib_paths_1=$(LC_ALL=C ${compiler} -print-search-dirs 2>&1 | tr -d '\r' | \ grep libraries | \ sed -e 's/libraries:.*=//' | \ awk 'BEGIN {FS="'${sep}'"} {for (i=0;++i<=NF;) print $i;}') |