simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust command line for objcopy to build do the right thing on x86_64.

Browse source 
git-svn-id: https://shellinabox.googlecode.com/svn/trunk@32 0da03de8-d603-11dd-86c2-0f8696b7b6f9
This commit is contained in:
zodiac 2009-01-08 00:05:03 +00:00
parent ee9a860bc2
commit ff781065ac
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile.am
View file

@ -101,7 +101,7 @@ clean-local:
-I binary `echo "$(build_cpu)" | \ -I binary `echo "$(build_cpu)" | \
grep -q '^i[0-9]86$$' && \ grep -q '^i[0-9]86$$' && \
echo ' -O elf32-i386 -B i386' || \ 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 ' \ `echo "$<" | sed -e ' \
s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \
t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \
@ -123,7 +123,7 @@ clean-local:
-I binary `echo "$(build_cpu)" | \ -I binary `echo "$(build_cpu)" | \
grep -q '^i[0-9]86$$' && \ grep -q '^i[0-9]86$$' && \
echo ' -O elf32-i386 -B i386' || \ 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 ' \ `echo "$<" | sed -e ' \
s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \
t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \
@ -145,7 +145,7 @@ clean-local:
-I binary `echo "$(build_cpu)" | \ -I binary `echo "$(build_cpu)" | \
grep -q '^i[0-9]86$$' && \ grep -q '^i[0-9]86$$' && \
echo ' -O elf32-i386 -B i386' || \ 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 ' \ `echo "$<" | sed -e ' \
s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \
t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \
@ -172,7 +172,7 @@ objcopy \
-I binary `echo $(build_cpu) | \ -I binary `echo $(build_cpu) | \
grep -q '^i[0-9]86$$' && \ grep -q '^i[0-9]86$$' && \
echo ' -O elf32-i386 -B i386' || \ 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 ' \ `echo "$@" | sed -e ' \
s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \
t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \
@ -194,7 +194,7 @@ objcopy \
-I binary `echo "$(build_cpu)" | \ -I binary `echo "$(build_cpu)" | \
grep -q '^i[0-9]86$$' && \ grep -q '^i[0-9]86$$' && \
echo ' -O elf32-i386 -B i386' || \ 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 ' \ `echo "$<" | sed -e ' \
s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \ s/\(.*\/\)\([^.]*\)\([.].*\)/\1\2\3=\2 /; \
t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \ t0; s/\([^.]*\)\([.].*\)/\1\2=\1 /; t0; s/.*/&=& /;:0; \