tjh.dev
1diff --git a/admin/Makefile.def b/admin/Makefile.def
2index 932d18f102..309114e339 100644
3--- a/admin/Makefile.def
4+++ b/admin/Makefile.def
5@@ -310,7 +310,7 @@ endif
6
7 # Apple CLANG flags (identical to GCC)
8 ifeq ($(GAG_COMPILER_CKIND),clang)
9- GLOBAL_CFLAGS += -pipe -fPIC
10+ GLOBAL_CFLAGS += -fPIC
11 ifeq ($(RELEASE_MODE),no)
12 OPTION_CFLAGS += -Wall
13 endif
14@@ -360,7 +360,7 @@ endif
15
16 # GFORTRAN flags
17 ifeq ($(GAG_COMPILER_FKIND),gfortran)
18- GLOBAL_FFLAGS += -J$(moddir) -pipe -fno-backslash -fno-range-check
19+ GLOBAL_FFLAGS += -J$(moddir) -fno-backslash -fno-range-check
20 ifeq ($(GAG_USE_SANITIZE),yes)
21 GLOBAL_FFLAGS += -fsanitize=address -fsanitize=null
22 # Can not be used with our memory(ip):
23diff --git a/admin/define-system.sh b/admin/define-system.sh
24index b6eda9fdfd..704050a9ac 100644
25--- a/admin/define-system.sh
26+++ b/admin/define-system.sh
27@@ -272,34 +272,23 @@ EOF
28 else
29 GAG_MACHINE=pc
30 fi
31- if which gcc > /dev/null 2>&1; then
32- DEFAULT_CCOMPILER=gcc
33- fi
34- if which g++ > /dev/null 2>&1; then
35- DEFAULT_CXXCOMPILER=g++
36- elif which clang++ > /dev/null 2>&1; then
37- DEFAULT_CXXCOMPILER=clang++
38- fi
39- if which ifort > /dev/null 2>&1; then
40- DEFAULT_FCOMPILER=ifort
41- elif which gfortran > /dev/null 2>&1; then
42- DEFAULT_FCOMPILER=gfortran
43- fi
44- elif [ `uname -p` = "arm" ]; then
45+ elif [ `uname -p` = "arm" ]; then
46 GAG_MACHINE=arm64
47- if which gcc > /dev/null 2>&1; then
48- DEFAULT_CCOMPILER=gcc
49- fi
50- if which clang++ > /dev/null 2>&1; then
51- DEFAULT_CXXCOMPILER=clang++
52- elif which g++ > /dev/null 2>&1; then
53- DEFAULT_CXXCOMPILER=g++
54- fi
55- if which ifort > /dev/null 2>&1; then
56- DEFAULT_FCOMPILER=ifort
57- elif which gfortran > /dev/null 2>&1; then
58- DEFAULT_FCOMPILER=gfortran
59- fi
60+ fi
61+ if which clang > /dev/null 2>&1; then
62+ DEFAULT_CCOMPILER=clang
63+ elif which gcc > /dev/null 2>&1; then
64+ DEFAULT_CCOMPILER=gcc
65+ fi
66+ if which clang++ > /dev/null 2>&1; then
67+ DEFAULT_CXXCOMPILER=clang++
68+ elif which g++ > /dev/null 2>&1; then
69+ DEFAULT_CXXCOMPILER=g++
70+ fi
71+ if which ifort > /dev/null 2>&1; then
72+ DEFAULT_FCOMPILER=ifort
73+ elif which gfortran > /dev/null 2>&1; then
74+ DEFAULT_FCOMPILER=gfortran
75 fi ;;
76 CYGWIN*)
77 if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then