diff options
Diffstat (limited to 'pkgs/applications/science/astronomy/gildas/clang.patch')
-rw-r--r-- | pkgs/applications/science/astronomy/gildas/clang.patch | 83 |
1 files changed, 69 insertions, 14 deletions
diff --git a/pkgs/applications/science/astronomy/gildas/clang.patch b/pkgs/applications/science/astronomy/gildas/clang.patch index 4d6654a99aee1..aee010835248e 100644 --- a/pkgs/applications/science/astronomy/gildas/clang.patch +++ b/pkgs/applications/science/astronomy/gildas/clang.patch @@ -1,22 +1,77 @@ -diff -ruN gildas-src-jun18a/admin/define-system.sh gildas-src-jun18a.clang/admin/define-system.sh ---- gildas-src-jun18a/admin/define-system.sh 2018-03-12 11:07:57.000000000 +0100 -+++ gildas-src-jun18a.clang/admin/define-system.sh 2018-06-12 14:56:14.000000000 +0200 -@@ -218,13 +218,13 @@ +diff --git a/admin/Makefile.def b/admin/Makefile.def +index 932d18f102..309114e339 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 b6eda9fdfd..704050a9ac 100644 +--- a/admin/define-system.sh ++++ b/admin/define-system.sh +@@ -272,34 +272,23 @@ EOF else GAG_MACHINE=pc fi - if which gcc > /dev/null 2>&1; then - DEFAULT_CCOMPILER=gcc -+ if which clang > /dev/null 2>&1; then -+ DEFAULT_CCOMPILER=clang - fi +- fi - if which g++ > /dev/null 2>&1; then - DEFAULT_CXXCOMPILER=g++ - elif which clang++ > /dev/null 2>&1; then -+ if which clang++ > /dev/null 2>&1; then - DEFAULT_CXXCOMPILER=clang++ -+ elif which g++ > /dev/null 2>&1; then -+ DEFAULT_CXXCOMPILER=g++ - fi - if which ifort > /dev/null 2>&1; then - DEFAULT_FCOMPILER=ifort +- DEFAULT_CXXCOMPILER=clang++ +- fi +- if which ifort > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=ifort +- elif which gfortran > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=gfortran +- fi +- elif [ `uname -p` = "arm" ]; then ++ elif [ `uname -p` = "arm" ]; then + GAG_MACHINE=arm64 +- if which gcc > /dev/null 2>&1; then +- DEFAULT_CCOMPILER=gcc +- fi +- if which clang++ > /dev/null 2>&1; then +- DEFAULT_CXXCOMPILER=clang++ +- elif which g++ > /dev/null 2>&1; then +- DEFAULT_CXXCOMPILER=g++ +- fi +- if which ifort > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=ifort +- elif which gfortran > /dev/null 2>&1; then +- DEFAULT_FCOMPILER=gfortran +- fi ++ fi ++ if which clang > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=clang ++ elif which gcc > /dev/null 2>&1; then ++ DEFAULT_CCOMPILER=gcc ++ fi ++ if which clang++ > /dev/null 2>&1; then ++ DEFAULT_CXXCOMPILER=clang++ ++ elif which g++ > /dev/null 2>&1; then ++ DEFAULT_CXXCOMPILER=g++ ++ fi ++ if which ifort > /dev/null 2>&1; then ++ DEFAULT_FCOMPILER=ifort ++ elif which gfortran > /dev/null 2>&1; then ++ DEFAULT_FCOMPILER=gfortran + fi ;; + CYGWIN*) + if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then |