diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2018-01-16 01:05:04 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2018-01-16 01:05:04 +0000 |
| commit | a1554bba0562ad32af2ef8f614d5e57d3ba6c69d (patch) | |
| tree | f938b21029b086a41d7790747eaa2317a1055f3e /Makefile.libcompat | |
| parent | 7de32ca3179efa4c105bb56f08b379ed8e9d2357 (diff) | |
| download | src-test2-a1554bba0562ad32af2ef8f614d5e57d3ba6c69d.tar.gz src-test2-a1554bba0562ad32af2ef8f614d5e57d3ba6c69d.zip | |
Check for GCC first rather than clang in the MIPS lib32 rules.
This works around a bug with X_COMPILER_TYPE and permits mips64 to build
again with in-tree gcc as well as clang and external gcc.
Sponsored by: DARPA / AFRL
Notes
Notes:
svn path=/head/; revision=328036
Diffstat (limited to 'Makefile.libcompat')
| -rw-r--r-- | Makefile.libcompat | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index afc1be1df065..dda1a29f50d5 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -35,19 +35,19 @@ LIB32WMAKEFLAGS= \ OBJCOPY="${XOBJCOPY}" .elif ${TARGET_ARCH:Mmips64*} != "" -.if ${WANT_COMPILER_TYPE} == clang || \ - (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == clang) -.if ${TARGET_ARCH:Mmips64el*} != "" -LIB32CPUFLAGS= -target mipsel-unknown-freebsd12.0 -.else -LIB32CPUFLAGS= -target mips-unknown-freebsd12.0 -.endif -.else +.if ${WANT_COMPILER_TYPE} == gcc || \ + (defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc) .if empty(TARGET_CPUTYPE) LIB32CPUFLAGS= -march=mips3 .else LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif +.else +.if ${TARGET_ARCH:Mmips64el*} != "" +LIB32CPUFLAGS= -target mipsel-unknown-freebsd12.0 +.else +LIB32CPUFLAGS= -target mips-unknown-freebsd12.0 +.endif .endif LIB32CPUFLAGS+= -mabi=32 LIB32WMAKEENV= MACHINE=mips MACHINE_ARCH=mips |