equal
deleted
inserted
replaced
|
1 Fix linking with gcc 5 using -fstack-protector. |
|
2 |
|
3 Need to determine if this should be submitted upstream. |
|
4 |
|
5 --- gnome-terminal-3.18.0/configure.ac Fri Oct 16 08:43:20 2015 |
|
6 +++ gnome-terminal-3.18.0/configure.ac Fri Oct 16 08:43:43 2015 |
|
7 @@ -267,6 +265,13 @@ |
|
8 # *********** |
|
9 # Compilation |
|
10 # *********** |
|
11 +# If these flags are supported for compilation, they must also be used when |
|
12 +# linking. To ensure that libtool doesn't strip them out, they're |
|
13 +# explicitly added to LDFLAGS using -Wc,$OPTION |
|
14 +if test "$cc_cv_CFLAGS__fstack_protector" != "no"; then |
|
15 + eval "AM_LDFLAGS='${AM_LDFLAGS} -Wc,-fstack-protector'" |
|
16 +fi |
|
17 + |
|
18 |
|
19 WARN_CFLAGS= |
|
20 CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \ |
|
21 @@ -310,7 +308,6 @@ |
|
22 -fno-strict-aliasing \ |
|
23 -fvisibility=hidden \ |
|
24 -fstack-protector \ |
|
25 - -fstack-protector-strong \ |
|
26 ]) |
|
27 |
|
28 # ********* |