diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-29 01:45:15 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-29 01:45:15 +0000 |
| commit | dd479c1b4796891be08bc62562159e443ce66077 (patch) | |
| tree | da37f24208d9e0f2e51b3dfbee99c311e656dcb5 /Makefile.libcompat | |
| parent | ecdefc65a1b28ecf9a3e9ea527ab67cd3baac263 (diff) | |
| download | FreeBSD-src-dd479c1b4796891be08bc62562159e443ce66077.zip FreeBSD-src-dd479c1b4796891be08bc62562159e443ce66077.tar.gz | |
Libcompat: Set build tools in environment rather than make overrides.
This allows the CXX hack in r300917 for external GCC to work for
the lib32 build. It is also the same pattern as the native
build uses by adding the tools into CROSSENV for external
toolchain, rather than make overrides.
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index 08d684c..e650266 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -17,7 +17,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif LIB32WMAKEENV= MACHINE=i386 MACHINE_ARCH=i386 \ MACHINE_CPU="i686 mmx sse sse2" -LIB32WMAKEFLAGS= \ +LIB32WMAKEENV+= \ AS="${XAS} --32" \ LD="${XLD} -m elf_i386_fbsd -Y P,${LIBCOMPATTMP}/usr/lib32" \ OBJCOPY="${XOBJCOPY}" @@ -29,7 +29,7 @@ LIB32CPUFLAGS= -mcpu=powerpc LIB32CPUFLAGS= -mcpu=${TARGET_CPUTYPE} .endif LIB32WMAKEENV= MACHINE=powerpc MACHINE_ARCH=powerpc -LIB32WMAKEFLAGS= \ +LIB32WMAKEENV+= \ LD="${XLD} -m elf32ppc_fbsd" \ OBJCOPY="${XOBJCOPY}" .endif @@ -84,9 +84,11 @@ LIBCOMPATWMAKEENV+= MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTREE} \ # Don't rebuild build-tools targets during normal build. LIBCOMPATWMAKEENV+= BUILD_TOOLS_META=.NOMETA_CMP .endif -LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCOMPATCFLAGS}" \ +LIBCOMPATWMAKEENV+= \ + CC="${XCC} ${LIBCOMPATCFLAGS}" \ CXX="${XCXX} ${LIBCOMPATCFLAGS} ${LIBCOMPATCXXFLAGS}" \ - CPP="${XCPP} ${LIBCOMPATCFLAGS}" \ + CPP="${XCPP} ${LIBCOMPATCFLAGS}" +LIBCOMPATWMAKEFLAGS+= \ DESTDIR=${LIBCOMPATTMP} \ -DNO_CPU_CFLAGS \ MK_CTF=no \ |
