svn commit: r377068 - in head/devel: . gnu-efi gnu-efi/files

[Edward Tomasz Napierała]

On 0115T1127, Koop Mast wrote:
> On 15-1-2015 11:11, Edward Tomasz Napierala wrote:
> > On 0115T1101, Koop Mast wrote:
> >> On 15-1-2015 10:55, Edward Tomasz Napierala wrote:
> >>> Author: trasz
> >>> Date: Thu Jan 15 09:55:56 2015
> >>> New Revision: 377068
> >>> URL: https://svnweb.freebsd.org/changeset/ports/377068
> >>> QAT: https://qat.redports.org/buildarchive/r377068/
> >>>
> >>> Log:
> >>>    New port: devel/gnu-efi
> > [..]
> >
> >>> + # Compilation tools
> >>> +-HOSTCC       := $(prefix)gcc
> >>> +-CC           := $(prefix)$(CROSS_COMPILE)gcc
> >>> ++HOSTCC       := $(prefix)gcc48
> >>> ++CC           := $(prefix)$(CROSS_COMPILE)gcc48
> >>> + AS           := $(prefix)$(CROSS_COMPILE)as
> >>> + LD           := $(prefix)$(CROSS_COMPILE)ld
> >>> + AR           := $(prefix)$(CROSS_COMPILE)ar
> >>>
> >> This doesn't look right. In the Makefile your set USE_GCC=4.8+, so
> >> gcc 4.9 could be used. So these lines need to be adapted to that into
> >> account.
> > Hm, you're right.  What's the suggested way - force 4.8, or somehow
> > make the diff above adapt to GCC version?
> >
> >
> 
> What about this patch? [1]:
> USE_GCC will set ${CC} for us, we just use sed to add it to 
> Make.defaults. Bonus points is that when lang/gcc is bumped to a newer 
> version we don't have to fix the makefile anymore.
> I also think USE_GCC=yes can be used since lang/gcc is 4.8, which is the 
> default gcc port.

Committed, thanks!  I've also fixed sysutils/shim in the same way.