aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.gecko.mk
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2020-09-07 00:58:07 +0000
committerPiotr Kubaj <pkubaj@FreeBSD.org>2020-09-07 00:58:07 +0000
commit410edceabd8c40821eefafa40fef9c00b1b97d53 (patch)
tree2a06d8fa122620139181329c9efd496cc3d059a6 /Mk/bsd.gecko.mk
parentd727619e354d688457613e88c5bd6691579c551f (diff)
downloadports-410edceabd8c40821eefafa40fef9c00b1b97d53.tar.gz
ports-410edceabd8c40821eefafa40fef9c00b1b97d53.zip
Mk/bsd.gecko.mk: fix build with defined CPUTYPE on powerpc64 (and possibly others)
In /etc/make.conf: CPUTYPE?=power9 When trying to build www/firefox: make: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) make: "/usr/ports/Mk/bsd.port.mk" line 4517: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5203: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: "/usr/ports/Mk/bsd.port.mk" line 5364: warning: duplicate script for target "/tmp/usr/ports/www/firefox/work-make" ignored make: "/usr/ports/Mk/bsd.port.mk" line 3423: warning: using previous script for "/tmp/usr/ports/www/firefox/work-make" defined here make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) make: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.gecko.mk" line 265: Malformed conditional (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) make: Fatal errors encountered -- cannot continue PR: 248826 Approved by: gecko (maintainer timeout)
Notes
Notes: svn path=/head/; revision=547872
Diffstat (limited to 'Mk/bsd.gecko.mk')
-rw-r--r--Mk/bsd.gecko.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index b3f6b7fc3ae0..776192fbd2f6 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -262,7 +262,7 @@ MOZ_OPTIONS+= --enable-debug --disable-release
STRIP= # ports/184285
.else
MOZ_OPTIONS+= --disable-debug --disable-debug-symbols --enable-release
-. if ${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}
+. if ${ARCH:Maarch64} || (defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2})
MOZ_OPTIONS+= --enable-rust-simd
. endif
.endif