diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2023-07-01 15:07:20 +0100 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2023-07-01 15:07:20 +0100 |
| commit | 2da872620b9f80ca0d76c16751129f9a76912fc8 (patch) | |
| tree | a6270d41aefb50527ee9c7622ac5741f02ebecd4 /build_common.sh | |
| parent | 3ce1c8c7cb088b327b8e51975efffaf70deb0283 (diff) | |
CI: Fix compiler identification after commit 1c4169e. [skip ci]
BSD sed:
sed: 1: "s/^.* Microsoft ($) C/C ...": bad flag in substitute command: 'm'
GNU sed:
sed: -e expression #1, char 73: unknown option to `s'
Address a couple other typos while at it.
Diffstat (limited to 'build_common.sh')
| -rw-r--r-- | build_common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build_common.sh b/build_common.sh index aa61b80a..84275e5a 100644 --- a/build_common.sh +++ b/build_common.sh @@ -145,7 +145,7 @@ cc_id_nocache() { return fi - cc_id_guessed=`echo "$cc_id_firstline" | sed 's/^.* Microsoft ($) C/C++ Optimizing Compiler Version \([0-9\.]*\) .*$/msvc-\1/'` + cc_id_guessed=`echo "$cc_id_firstline" | sed 's/^Microsoft (R) C\/C++ Optimizing Compiler Version \([0-9\.]*\) .*$/msvc-\1/'` if [ "$cc_id_firstline" != "$cc_id_guessed" ]; then echo "$cc_id_guessed" return @@ -244,7 +244,7 @@ os_id() { MSYS*) # uname -s produces "MSYS_NT-{NT version?}-{build?} # uname -r produces MSYS2 version? - echo "$os_id_version", MSYS "os_id_release" + echo "$os_id_version", MSYS "$os_id_release" ;; *) echo 'UNKNOWN' @@ -279,7 +279,7 @@ print_so_deps() { run_after_echo objdump -p "${1:?}" ;; MSYS*) - run_after_echo dumpbin/dependents "${1:?}" + run_after_echo dumpbin /dependents "${1:?}" ;; *) run_after_echo ldd "${1:?}" |