diff options
| author | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
|---|---|---|
| committer | Arne Babenhauserheide <arne_bab@web.de> | 2011-11-05 18:29:51 +0100 |
| commit | ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a (patch) | |
| tree | 4a66b774bf493e95fc2961236de0ee84b4646362 /open_issues/binutils/log_build.diff | |
| parent | 42dc7198bbea79f4abe15d40804f539ffed1b05b (diff) | |
| parent | 2e315ef11db39e8ee0a0decc054801521ee049dd (diff) | |
| download | web-ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a.tar.gz web-ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a.tar.bz2 web-ae2fb6ad10b538d428ff0dd7138ae1cf02b1862a.zip | |
fix merge conflict
Diffstat (limited to 'open_issues/binutils/log_build.diff')
| -rw-r--r-- | open_issues/binutils/log_build.diff | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/open_issues/binutils/log_build.diff b/open_issues/binutils/log_build.diff index 79172cf6..79946f63 100644 --- a/open_issues/binutils/log_build.diff +++ b/open_issues/binutils/log_build.diff @@ -1,5 +1,5 @@ ---- /dev/fd/63 2011-10-11 14:23:15.275568065 +0200 -+++ /dev/fd/62 2011-10-11 14:23:15.275568065 +0200 +--- /dev/fd/63 2011-10-22 11:44:16.461445903 +0200 ++++ /dev/fd/62 2011-10-22 11:44:16.461445903 +0200 @@ -276,12 +276,12 @@ checking for sys/sysinfo.h... yes checking for machine/hal_sysinfo.h... no @@ -214,7 +214,7 @@ checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes -@@ -2473,7 +2452,7 @@ +@@ -2475,7 +2454,7 @@ checking for BSD- or MS-compatible name lister (nm)... nm checking the name lister (nm) interface... BSD nm checking whether ln -s works... yes @@ -223,7 +223,7 @@ checking whether the shell understands some XSI constructs... yes checking whether the shell understands "+="... no checking for ld option to reload object files... -r -@@ -2494,7 +2473,7 @@ +@@ -2496,7 +2475,7 @@ checking if gcc-4.6 supports -c -o file.o... (cached) yes checking whether the gcc-4.6 linker (ld) supports shared libraries... yes checking whether -lc should be explicitly linked in... no @@ -232,7 +232,7 @@ checking how to hardcode library paths into programs... immediate checking whether stripping libraries is possible... yes checking if libtool supports shared libraries... yes -@@ -2510,7 +2489,7 @@ +@@ -2512,7 +2491,7 @@ checking if g++-4.6 supports -c -o file.o... yes checking if g++-4.6 supports -c -o file.o... (cached) yes checking whether the g++-4.6 linker (ld) supports shared libraries... yes @@ -241,7 +241,7 @@ checking how to hardcode library paths into programs... immediate checking whether NLS is requested... yes checking for catalogs to be installed... bg da es fi fr ga id ja sv tr vi zh_CN zh_TW -@@ -2590,13 +2569,13 @@ +@@ -2592,13 +2571,13 @@ /bin/dash ../../master/ld/../ylwrap ../../master/ld/ldgram.y y.tab.c ldgram.c y.tab.h ldgram.h y.output ldgram.output -- bison -y -d updating ldgram.h (echo "/* This file is automatically generated. DO NOT EDIT! */";\ @@ -257,7 +257,7 @@ | sed -e 's/ e/ ld/g' -e 's/ ld/ /g' -e 's/[.]o//g'`; do \ echo " &ld_${f}_emulation, \\"; \ done;\ -@@ -2710,17 +2689,11 @@ +@@ -2712,17 +2691,11 @@ gcc-4.6 -DHAVE_CONFIG_H -I. -I../../master/ld -I. -I../../master/ld -I../bfd -I../../master/ld/../bfd -I../../master/ld/../include -g -O2 -DENABLE_PLUGINS -DLOCALEDIR="\"[...]/hurd/master.build.install/share/locale\"" -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Werror -g -O2 -MT plugin.o -MD -MP -MF .deps/plugin.Tpo -c -o plugin.o ../../master/ld/plugin.c mv -f .deps/plugin.Tpo .deps/plugin.Po cp ../../master/ld/emultempl/astring.sed stringify.sed |