Skip to content

Commit

Permalink
Remove changes to build script
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo committed Oct 11, 2024
1 parent f04687b commit 50db4bc
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions scripts/ci-github.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 50db4bc

Please sign in to comment.