From c19e48fe41a542522d023450dc8a6b31a85e9251 Mon Sep 17 00:00:00 2001 From: Marco Matthies Date: Tue, 19 Oct 2021 20:30:47 +0200 Subject: [PATCH] Clarify error messages in compiler wrappers (#173) * Clarify error messages * Fix tests of compiler wrappers --- src/Runner.jl | 4 ++-- test/runners.jl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Runner.jl b/src/Runner.jl index d8412aec..cb3e9169 100644 --- a/src/Runner.jl +++ b/src/Runner.jl @@ -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 """) @@ -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 """) diff --git a/test/runners.jl b/test/runners.jl index d26010a2..9960000f 100644 --- a/test/runners.jl +++ b/test/runners.jl @@ -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()