646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
diff --git a/admin/Makefile.def b/admin/Makefile.def
|
|
index facc205..0daceaf 100644
|
|
--- a/admin/Makefile.def
|
|
+++ b/admin/Makefile.def
|
|
@@ -310,7 +310,7 @@ endif
|
|
|
|
# Apple CLANG flags (identical to GCC)
|
|
ifeq ($(GAG_COMPILER_CKIND),clang)
|
|
- GLOBAL_CFLAGS += -pipe -fPIC
|
|
+ GLOBAL_CFLAGS += -fPIC
|
|
ifeq ($(RELEASE_MODE),no)
|
|
OPTION_CFLAGS += -Wall
|
|
endif
|
|
@@ -360,7 +360,7 @@ endif
|
|
|
|
# GFORTRAN flags
|
|
ifeq ($(GAG_COMPILER_FKIND),gfortran)
|
|
- GLOBAL_FFLAGS += -J$(moddir) -pipe -fno-backslash -fno-range-check
|
|
+ GLOBAL_FFLAGS += -J$(moddir) -fno-backslash -fno-range-check
|
|
ifeq ($(GAG_USE_SANITIZE),yes)
|
|
GLOBAL_FFLAGS += -fsanitize=address -fsanitize=null
|
|
# Can not be used with our memory(ip):
|
|
diff --git a/admin/define-system.sh b/admin/define-system.sh
|
|
index 36d4ab9..0233259 100644
|
|
--- a/admin/define-system.sh
|
|
+++ b/admin/define-system.sh
|
|
@@ -287,8 +287,8 @@ EOF
|
|
fi
|
|
elif [ `uname -p` = "arm" ]; then
|
|
GAG_MACHINE=arm64
|
|
- if which gcc > /dev/null 2>&1; then
|
|
- DEFAULT_CCOMPILER=gcc
|
|
+ if which clang > /dev/null 2>&1; then
|
|
+ DEFAULT_CCOMPILER=clang
|
|
fi
|
|
if which clang++ > /dev/null 2>&1; then
|
|
DEFAULT_CXXCOMPILER=clang++
|