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
|
Description: Use CPPFLAGS/CFLAGS/CXXFLAGS for hardening.
Author: Doug Torrance <dtorrance@debian.org>
Bug: https://github.com/janverschelde/PHCpack/issues/54
Last-Update: 2021-02-27
--- a/src/Ada/Main/main.gpr
+++ b/src/Ada/Main/main.gpr
@@ -97,7 +97,15 @@
-- for Default_Switches ("Ada") use ("-gnatwa", "-gnatva");
for Default_Switches ("Ada") use ("-O3", "-gnatv", "-gnatp", "-gnatf");
- for Switches ("use_c2phc.adb") use ("-c");
+ for Default_Switches ("C++") use External_As_List ("CPPFLAGS", " ") &
+ External_As_List ("CXXFLAGS", " ");
+ for Default_Switches ("C") use External_As_List ("CPPFLAGS", " ") &
+ External_As_List ("CFLAGS", " ");
+ for Default_Switches ("Ada") use External_As_List ("ADAFLAGS", " ");
+
+ for Switches ("use_c2phc.adb") use ("-c")
+ & External_As_List ("CPPFLAGS", " ") &
+ External_As_List ("CXXFLAGS", " ");
for Switches ("feedback.c") use ("-fPIE");
for Switches ("pieri_sols.c") use ("-fPIE");
@@ -117,6 +125,7 @@
end Binder;
package Linker is
+ for Default_Switches ("Ada") use External_As_List ("LDFLAGS", " ");
for Switches ("phctop.adb") use ("-lm");
--- a/src/Ada/Main/phclib.gpr
+++ b/src/Ada/Main/phclib.gpr
@@ -114,14 +114,24 @@
"c_integer_arrays", "c_double_arrays",
"phctop", "use_c2phc"
);
- for Library_Standalone use "encapsulated";
+ for Library_Standalone use "encapsulated";
+ for Library_Options use external_as_list ("LDFLAGS", " ");
+
package Compiler is
-- for Default_Switches ("Ada") use ("-gnatwa", "-gnatva");
for Default_Switches ("Ada") use ("-O3", "-gnatv", "-gnatp", "-gnatf");
- for Switches ("use_c2phc.adb") use ("-c");
+ for Default_Switches ("C++") use External_As_List ("CPPFLAGS", " ") &
+ External_As_List ("CXXFLAGS", " ");
+ for Default_Switches ("C") use External_As_List ("CPPFLAGS", " ") &
+ External_As_List ("CFLAGS", " ");
+ for Default_Switches ("Ada") use External_As_List ("ADAFLAGS", " ");
+
+ for Switches ("use_c2phc.adb") use ("-c")
+ & External_As_List ("CPPFLAGS", " ") &
+ External_As_List ("CXXFLAGS", " ");
end Compiler;
|
