blob: dbc41c774db55ec35aae62bfbe5a2b4706d8c406 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
|
--- jpeg-8c.orig/ltmain.sh 2010-11-17 22:41:29.000000000 +0100
<<<<<<< HEAD
+++ jpeg-8c/ltmain.sh 2011-04-07 11:28:48.000000000 +0200
=======
+++ jpeg-8c/ltmain.sh 2011-04-01 17:20:27.503069018 +0200
>>>>>>> 62cd6b2635b1e0d233c8537a008bc823c4cd4b2c
@@ -5840,7 +5840,7 @@ func_mode_link ()
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
|
