From ff781065ac631e4da81fed62942167ceeef3f7af Mon Sep 17 00:00:00 2001 From: zodiac Date: Thu, 8 Jan 2009 00:05:03 +0000 Subject: [PATCH] Adjust command line for objcopy to build do the right thing on x86_64. git-svn-id: https://shellinabox.googlecode.com/svn/trunk@32 0da03de8-d603-11dd-86c2-0f8696b7b6f9 --- Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 43d3198..149003c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -101,7 +101,7 @@ clean-local: -I binary `echo "$(build_cpu)" | \ grep -q '^i[0-9]86$$' && \ echo ' -O elf32-i386 -B i386' || \ - echo ' -O elf64-x86-64 -B x86-64'` \ + echo ' -O elf64-x86-64 -B i386:x86-64'` \ `echo "$<" | sed -e ' \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ @@ -123,7 +123,7 @@ clean-local: -I binary `echo "$(build_cpu)" | \ grep -q '^i[0-9]86$$' && \ echo ' -O elf32-i386 -B i386' || \ - echo ' -O elf64-x86-64 -B x86-64'` \ + echo ' -O elf64-x86-64 -B i386:x86-64'` \ `echo "$<" | sed -e ' \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ @@ -145,7 +145,7 @@ clean-local: -I binary `echo "$(build_cpu)" | \ grep -q '^i[0-9]86$$' && \ echo ' -O elf32-i386 -B i386' || \ - echo ' -O elf64-x86-64 -B x86-64'` \ + echo ' -O elf64-x86-64 -B i386:x86-64'` \ `echo "$<" | sed -e ' \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ @@ -172,7 +172,7 @@ objcopy \ -I binary `echo $(build_cpu) | \ grep -q '^i[0-9]86$$' && \ echo ' -O elf32-i386 -B i386' || \ - echo ' -O elf64-x86-64 -B x86-64'` \ + echo ' -O elf64-x86-64 -B i386:x86-64'` \ `echo "$@" | sed -e ' \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ @@ -194,7 +194,7 @@ objcopy \ -I binary `echo "$(build_cpu)" | \ grep -q '^i[0-9]86$$' && \ echo ' -O elf32-i386 -B i386' || \ - echo ' -O elf64-x86-64 -B x86-64'` \ + echo ' -O elf64-x86-64 -B i386:x86-64'` \ `echo "$<" | sed -e ' \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \