Skip to content

Commit

Permalink
240409.183731.HKT revise .cirrus.yml for freebsd on arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
zaikunzhang committed Apr 9, 2024
1 parent 644a425 commit aceeb2c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
4 changes: 1 addition & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ task:

matrix:
- name: AMD64 FreeBSD
container:
freebsd_instance:
image_family: freebsd-14-0

- name: ARM64 FreeBSD
arm_container:
freebsd_instance:
image_family: freebsd-14-0
image: freebsd/aarch64:14.0

- name: MacOS Silicon
macos_instance:
Expand Down
9 changes: 5 additions & 4 deletions fortran/tests/makefiles/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -258,15 +258,16 @@ $(foreach TST, $(TESTS_INT_C_NO_QP), $(eval $(TST): SUBTESTS_C := \
.PHONY: all test test_c clean $(TESTS) $(TESTS_C) $(TESTS_INT) $(TESTS_INT_C) source_* clean*

# Operating system.
OSTYPE :=
OSTYPE := LINUX # We assume the OS is LINUX by default.
ifeq ($(OS),Windows_NT)
OSTYPE := WINDOWS
else
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
OSTYPE := MAC
else # We assume the OS is LINUX by default.
OSTYPE := LINUX
endif
ifeq ($(UNAME_S),FreeBSD)
OSTYPE := FREEBSD
endif
endif

Expand Down Expand Up @@ -446,7 +447,7 @@ else
GFORT := $(GFORT) -fno-stack-arrays -fstack-check
endif
# -fsanitize=leak,address does not work with gdb.
FSAN := #$(shell if [[ $$(($(GFORT) -dumpversion 2>/dev/null || echo 0) | sed 's|\..*||') -gt 9 && $(OSTYPE) != 'MAC' ]] ; then echo "-fsanitize=undefined"; else echo ""; fi)
FSAN := $(shell if [[ $$(($(GFORT) -dumpversion 2>/dev/null || echo 0) | sed 's|\..*||') -gt 9 && $(OSTYPE) != 'MAC' && $(OSTYPE) != 'FREEBSD' ]] ; then echo "-fsanitize=undefined"; else echo ""; fi)
GFORT := $(GFORT) $(GFSTD) -fall-intrinsics -frecursive \
-Wall -Wextra -Wpedantic -pedantic -Wampersand -Wconversion -Wuninitialized -Wmaybe-uninitialized \
-Wsurprising -Waliasing -Wimplicit-interface -Wimplicit-procedure -Wintrinsics-std -Wunderflow \
Expand Down

0 comments on commit aceeb2c

Please sign in to comment.