Skip to content

Commit

Permalink
Clarify error messages in compiler wrappers (#173)
Browse files Browse the repository at this point in the history
* Clarify error messages

* Fix tests of compiler wrappers
  • Loading branch information
marcom committed Oct 19, 2021
1 parent 4a71bba commit c19e48f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/Runner.jl
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
if lock_microarchitecture
write(io, raw"""
if [[ " ${ARGS[@]} " == *"-march="* ]]; then
echo "BinaryBuilder: Cannot force an architecture" >&2
echo "BinaryBuilder: Cannot force an architecture via -march" >&2
exit 1
fi
""")
Expand All @@ -229,7 +229,7 @@ function generate_compiler_wrappers!(platform::AbstractPlatform; bin_path::Abstr
if no_soft_float
write(io, raw"""
if [[ " ${ARGS[@]} " == *"-mfloat-abi=soft"* ]]; then
echo "BinaryBuilder: ${target} platform does not support soft-float ABI" >&2
echo "BinaryBuilder: ${target} platform does not support soft-float ABI (-mfloat-abi=soft)" >&2
exit 1
fi
""")
Expand Down
2 changes: 1 addition & 1 deletion test/runners.jl
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ end
iobuff = IOBuffer()
@test !run(ur, cmd, iobuff; tee_stream=devnull)
seekstart(iobuff)
@test readlines(iobuff)[2] == "BinaryBuilder: Cannot force an architecture"
@test readlines(iobuff)[2] == "BinaryBuilder: Cannot force an architecture via -march"

ur = preferred_runner()(dir; platform=platform, lock_microarchitecture=false)
iobuff = IOBuffer()
Expand Down

0 comments on commit c19e48f

Please sign in to comment.