Patchwork cross compiler

login
register
about
Submitter Myles Watson
Date 2009-10-30 20:37:21
Message ID <2831fecf0910301337v21911df3pe51b437e2f0b992f@mail.gmail.com>
Download mbox | patch
Permalink /patch/520/
State Accepted
Headers show

Comments

Myles Watson - 2009-10-30 20:37:21
On Fri, Oct 30, 2009 at 1:46 PM, Patrick Georgi <patrick@georgi-clan.de>wrote:

> Am Freitag, den 30.10.2009, 13:12 -0600 schrieb Myles Watson:
> >
> >
> > On Fri, Oct 30, 2009 at 1:02 PM, Patrick Georgi
> > <patrick@georgi-clan.de> wrote:
> >         Am Freitag, den 30.10.2009, 12:15 -0600 schrieb Myles Watson:
> >         > for gccprefixes in `pwd`/../crossgcc/xgcc/bin/i386-elf-
> >         i386-elf- "";
> >         > do
> >
> >         Maybe add $PWD/util/crossgcc/xgcc/bin/i386-elf- to the list,
> >         too - it
> >         can't hurt.
> > The only problem with that is then if you have built crosgcc, but you
> > don't want to use it, how do you specify that?  The Makefile will
> > generate .xcompile automatically with it included.
> >
> > Is that the desired behavior?
> crossgcc is under our control, stupid distribution compilers are not, so
> in my opinion, crossgcc should be preferred over alternatives.
>
> Esp. as there's a simple workaround: move xgcc away.
>
That sounds fine with me.  If someone went to the trouble to build xgcc,
default to it.

Here's an updated patch.  Will you commit it since my authorization is
failing?

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles

Patch

Index: svn/Makefile
===================================================================
--- svn.orig/Makefile
+++ svn/Makefile
@@ -289,7 +289,7 @@  doxygen-clean:
 	rm -rf $(DOXYGEN_OUTPUT_DIR)
 
 clean: doxygen-clean
-	rm -f $(allobjs) $(obj)/coreboot* .xcompile
+	rm -f $(allobjs) $(obj)/coreboot*
 	rm -f $(obj)/option_table.* $(obj)/crt0_includes.h $(obj)/ldscript
 	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/static.c $(obj)/mainboard/$(MAINBOARDDIR)/config.py $(obj)/mainboard/$(MAINBOARDDIR)/static.dot
 	rm -f $(obj)/mainboard/$(MAINBOARDDIR)/auto.inc $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s $(obj)/mainboard/$(MAINBOARDDIR)/crt0.disasm
@@ -297,7 +297,7 @@  clean: doxygen-clean
 	$(MAKE) -C util/sconfig clean
 
 distclean: clean
-	rm -rf $(obj)
+	rm -rf $(obj) .xcompile
 	rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig*
 
 update:
Index: svn/util/xcompile/xcompile
===================================================================
--- svn.orig/util/xcompile/xcompile
+++ svn/util/xcompile/xcompile
@@ -10,7 +10,8 @@  GCCPREFIX=invalid
 TMP=`mktemp /tmp/temp.XXXX`
 echo "mov %eax, %eax" > ${TMP}.s
 printf "\x7fELF" > ${TMP}.compare
-for gccprefixes in `pwd`/../crossgcc/xgcc/bin/i386-elf- i386-elf- ""; do
+for gccprefixes in `pwd`/util/crossgcc/xgcc/bin/i386-elf- \
+		   `pwd`/../crossgcc/xgcc/bin/i386-elf-  i386-elf- ""; do
 	if which ${gccprefixes}as 2>/dev/null >/dev/null; then
 		printf ""
 	else