diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5bc32697..08324cae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -345,6 +345,18 @@ jobs: ( echo ; set -x ; w=$(which $tool) ; ls -al $w ; ls -alhL $w ; $tool --version ) fi done + if [[ ${{ matrix.compiler }} == flang ]] && false ; then + # Report any libflang_rt appearing in common places: + echo + if [ -n "${FC}" ] ; then + RDIR="$(${FC} -print-resource-dir)" + fi + if command -v brew ; then + BDIR="$(brew --prefix)" + fi + set -x + find $RDIR $BDIR /usr/lib/ -name '*flang_rt*' -exec ls -al {} \; | sort | uniq + fi - name: Build Caffeine (install.sh) run: | @@ -413,6 +425,16 @@ jobs: ) ; \ done + - name: Add Linux Brew to PATH + if: ${{ contains(matrix.os, 'ubuntu') && matrix.brew_via_install }} + run: | + set -x + # the first install.sh command established Linux Brew, so add it to the + # PATH to prevent pointless overwrites in the second install.sh below + HOMEBREW_PREFIX="/home/linuxbrew/.linuxbrew" + ( set +e ; ls -al ${HOMEBREW_PREFIX}/bin ; exit 0 ) + echo "PATH=${HOMEBREW_PREFIX}/bin:${PATH}" >> "$GITHUB_ENV" + - name: Build and Test Caffeine (thread-safe) run: | for var in FC CC CXX FFLAGS CPPFLAGS CFLAGS LDFLAGS LIBS GASNET_CONFIGURE_ARGS ; do \