Skip to content

Commit 2d6b85e

Browse files
committed
Undo conditional assignment of CC, FC, F77, AR, RANLIB
CC, FC, and AR have defaults and causes complications, so undo last commit Update readline version number in site_specific.mk.in git-svn-id: file:///home/users/tmap/svn/repos/ferret/trunk@25882 fdbf22ae-c210-0410-be80-ca943da6b8f8
1 parent cdf1907 commit 2d6b85e

11 files changed

+2
-268
lines changed

platform_specific.mk.i386-linux

-10
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,11 @@ endif
5454

5555
PLATFORM = $(shell uname -s -r) 32-bit
5656

57-
ifeq ($(strip $(CC)),)
5857
CC = $(shell which gcc)
59-
endif
60-
ifeq ($(strip $(FC)),)
6158
FC = $(shell which gfortran)
62-
endif
63-
ifeq ($(strip $(F77)),)
6459
F77 = $(shell which gfortran)
65-
endif
66-
ifeq ($(strip $(AR)),)
6760
AR = $(shell which ar)
68-
endif
69-
ifeq ($(strip $(RANLIB)),)
7061
RANLIB = $(shell which ranlib)
71-
endif
7262

7363
ARFLAGS = -cr
7464

platform_specific.mk.intel-mac

-10
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,11 @@ endif
5656

5757
PLATFORM = $(shell uname -s -r)
5858

59-
ifeq ($(strip $(CC)),)
6059
CC = $(shell which clang)
61-
endif
62-
ifeq ($(strip $(FC)),)
6360
FC = $(shell which gfortran)
64-
endif
65-
ifeq ($(strip $(F77)),)
6661
F77 = $(shell which gfortran)
67-
endif
68-
ifeq ($(strip $(AR)),)
6962
AR = $(shell which ar)
70-
endif
71-
ifeq ($(strip $(RANLIB)),)
7263
RANLIB = $(shell which ranlib)
73-
endif
7464

7565
ARFLAGS = -cr
7666

platform_specific.mk.x86_64-linux

-10
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,11 @@ endif
5454

5555
PLATFORM = $(shell uname -s -r) 64-bit
5656

57-
ifeq ($(strip $(CC)),)
5857
CC = $(shell which gcc)
59-
endif
60-
ifeq ($(strip $(FC)),)
6158
FC = $(shell which gfortran)
62-
endif
63-
ifeq ($(strip $(F77)),)
6459
F77 = $(shell which gfortran)
65-
endif
66-
ifeq ($(strip $(AR)),)
6760
AR = $(shell which ar)
68-
endif
69-
ifeq ($(strip $(RANLIB)),)
7061
RANLIB = $(shell which ranlib)
71-
endif
7262

7363
ARFLAGS = -cr
7464

site_specific.mk.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ NETCDF_LIBDIR = /usr/local/netcdf-4.4.1.1/lib
8888
## this value (or leave it blank). In this case the system's readline and history
8989
## shared-object libraries will be used.
9090
## =========================
91-
# READLINE_LIBDIR = $(HOME)/.local/Cellar/readline/7.0.5/lib
92-
# READLINE_LIBDIR = /usr/local/Cellar/readline/7.0.5/lib
91+
# READLINE_LIBDIR = $(HOME)/.local/Cellar/readline/8.0.0/lib
92+
# READLINE_LIBDIR = /usr/local/Cellar/readline/8.0.0/lib
9393
READLINE_LIBDIR =
9494

9595
##

xgks/CUSTOMIZE.alpha

-32
This file was deleted.

xgks/CUSTOMIZE.i586

-18
This file was deleted.

xgks/CUSTOMIZE.ia64-linux

-35
This file was deleted.

xgks/CUSTOMIZE.linux

-37
This file was deleted.

xgks/CUSTOMIZE.macintosh

-41
This file was deleted.

xgks/CUSTOMIZE.ppc64

-40
This file was deleted.

xgks/CUSTOMIZE.solaris

-33
This file was deleted.

0 commit comments

Comments
 (0)