Skip to content

Commit

Permalink
HACK investigate macos build failure
Browse files Browse the repository at this point in the history
  • Loading branch information
gperciva committed Aug 21, 2022
1 parent c42dede commit e9a1e76
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 39 deletions.
38 changes: 0 additions & 38 deletions .github/workflows/compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,44 +26,6 @@ env:
LDFLAGS_OSX: -L/usr/local/opt/[email protected]/lib

jobs:
Ubuntu:
name: Ubuntu
# Ubuntu 16.04 comes with valgrind-3.11, which can't handle RDRAND
# instructions. We need at least Ubuntu 18.04, which has valgrind-3.13.
runs-on: ubuntu-18.04
steps:
- name: Update apt-get
run: sudo apt-get update
- name: Install software
run: sudo apt-get install --no-install-recommends valgrind
- name: Checkout code
uses: actions/checkout@v2
- name: Compile with clang
env:
CC: clang-9
CFLAGS: ${{ env.CFLAGS_ALL }}
${{ env.CFLAGS_CLANG_LIBCPERCIVA }}
${{ env.CFLAGS_CLANG_PROJECT }}
run: make
- name: Test clang binaries
env:
USE_VALGRIND: 1
run: make test
- name: Clean
run: make clean
- name: Compile with gcc
env:
CC: gcc-10
CFLAGS: ${{ env.CFLAGS_ALL }}
${{ env.CFLAGS_GCC_LIBCPERCIVA }}
${{ env.CFLAGS_GCC_PROJECT }}
run: make
- name: Test gcc binaries
env:
USE_VALGRIND: 1
run: make test
- name: Check for untracked files
run: test -z "$(git status --porcelain=v1)"
macOS:
name: macOS
runs-on: macOS-11
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ apisupport-config.h:
else \
:; \
fi > $@
exit 1

cpusupport-config.h:
if [ -d ${LIBCPERCIVA_DIR}/cpusupport/ ]; then \
Expand Down
3 changes: 2 additions & 1 deletion apisupport/Build/apisupport.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ feature() {
for API_CFLAGS in "$@"; do
if ${CC} ${CFLAGS} ${CFLAGS_HARDCODED} ${API_CFLAGS} \
"${feature_filename}" ${LADD_EXTRA} ${EXTRALIB} \
2>/dev/null; then
; then
#2>/dev/null; then
rm -f a.out
break;
fi
Expand Down

0 comments on commit e9a1e76

Please sign in to comment.