From 50db4bc1f0c43f36dd5ba2253663f5c66acbcfa9 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Fri, 11 Oct 2024 10:34:28 +0200 Subject: [PATCH] Remove changes to build script --- scripts/ci-github.sh | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/scripts/ci-github.sh b/scripts/ci-github.sh index 9a1a6b5ef..0b28b2dcb 100755 --- a/scripts/ci-github.sh +++ b/scripts/ci-github.sh @@ -29,24 +29,12 @@ fi # Patch version scripts/version-patcher.sh -# use -static-libgcc only in recent-enough GCC versions (>=12). The version is -# the last space-separated field of the first line in gcc --version output. -# Also, this is only needed on macOS for now. -ALR_LINKER_ARGS= -if [ "$(get_OS)" == "macos" ]; then - gcc_version=$(gcc --version | head -n 1 | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | tail -n1 | cut -f1 -d.) - if [ "$(echo "$gcc_version >= 12" | bc)" -eq 1 ]; then - ALR_LINKER_ARGS="-static-libgcc" - fi -fi - # Build alr if no argument is "build=false" if [[ " $* " == *" build=false "* ]]; then echo "Skipping alr build, explicitly disabled via arguments" else export ALIRE_OS=$(get_OS) - echo "Using ALR_LINKER_ARGS=$ALR_LINKER_ARGS" - gprbuild -j0 -p -P alr_env -largs $ALR_LINKER_ARGS + gprbuild -j0 -p -P alr_env fi # Disable distro detection if supported @@ -82,12 +70,6 @@ echo ALR SEARCH: alr -q -d search --list --external echo ............................ -# Exit without testing if some argument is "test=false" -if [[ " $* " == *" test=false "* ]]; then - echo "SKIPPING testsuite, explicitly disabled via arguments" - exit 0 -fi - echo TESTSUITE: # Run e3.testsuite echo