1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
etc/make.platform.gnu3 | 14 +++++++-------
etc/make.platform.gnu4 | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/etc/make.platform.gnu3 b/etc/make.platform.gnu3
index 54b0297..138fa47 100644
--- a/etc/make.platform.gnu3
+++ b/etc/make.platform.gnu3
@@ -107,8 +107,8 @@ NON_ANSI_C_FLAG=
C_WARNINGS=$(WARNINGS)
# C compiler flags
-CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(C_WARNINGS) \
+CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(C_WARNINGS) \
$(DEFINES) $(INCLUDES)
## C++ compiler
@@ -128,14 +128,14 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
EXT=C
# C++ compiler flags
-C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
+C++FLAGS=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
$(DEFINES) $(INCLUDES)
-C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
$(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES)
# C++FLAGS_RELAXED should be set to avoid warnings reported by third party
# source code that is not maintained by PDB
-C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
$(DEFINES) $(INCLUDES)
## Fortran compiler
@@ -145,7 +145,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
F77=f77
# Fortran compiler flags
-FFLAGS=-O -u
+FFLAGS=$(F_OPT)
# Additional Fortran libraries
F77LIBS=
@@ -158,7 +158,7 @@ F77LIBS=
STATIC_LINKING=-static
# Linker flags
-LDFLAGS=$(ABI) -w $(STATIC_LINKING)
+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT)
LDFLAGS_NO_STATIC=$(ABI) -w
# Fortran linker
diff --git a/etc/make.platform.gnu4 b/etc/make.platform.gnu4
index 6676f35..51681fa 100644
--- a/etc/make.platform.gnu4
+++ b/etc/make.platform.gnu4
@@ -107,11 +107,11 @@ NON_ANSI_C_FLAG=
C_WARNINGS=$(WARNINGS)
# C compiler flags
-CFLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
-CFLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES)
+CFLAGS=$(C_OPT) $(ABI) $(PIC) $(ANSI_C_FLAG) $(C_WARNINGS) $(DEFINES) $(INCLUDES)
+CFLAGS_NONANSI=$(C_OPT) $(ABI) $(PIC) $(NON_ANSI_C_FLAG) $(DEFINES) $(INCLUDES)
## C++ compiler
-## This part defines C++ compiler information
+
# C++ compiler executable
CCC=g++
@@ -127,14 +127,14 @@ C_PLUS_WARNINGS=$(WARNINGS) $(NO_DEPRECATED)
EXT=C
# C++ compiler flags
-C++FLAGS=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
+C++FLAGS=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(C_PLUS_WARNINGS) \
$(DEFINES) $(INCLUDES)
-C++FLAGS_NONANSI=$(OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
+C++FLAGS_NONANSI=$(CXX_OPT) $(ABI) $(PIC) $(NON_ANSI_C_PLUS_FLAG) \
$(C_PLUS_WARNINGS) $(DEFINES) $(INCLUDES)
# C++FLAGS_RELAXED should be set to avoid warnings reported by third party
# source code that is not maintained by PDB
-C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
+C++FLAGS_RELAXED=$(CXX_OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
$(DEFINES) $(INCLUDES)
## Fortran compiler
@@ -144,7 +144,7 @@ C++FLAGS_RELAXED=$(OPT) $(ABI) $(PIC) $(ANSI_C_PLUS_FLAG) $(NO_DEPRECATED) \
F77=f77
# Fortran compiler flags
-FFLAGS=-O -u
+FFLAGS=$(F_OPT)
# Additional Fortran libraries
F77LIBS=
@@ -157,7 +157,7 @@ F77LIBS=
STATIC_LINKING=-static
# Linker flags
-LDFLAGS=$(ABI) -w $(STATIC_LINKING)
+LDFLAGS=$(ABI) -w $(STATIC_LINKING) $(LD_OPT)
LDFLAGS_NO_STATIC=$(ABI) -w
# Fortran linker
|
