diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-11-29 12:42:33 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-11-29 12:42:33 +0800 |
| commit | 68a619ff51d9185a365b280da45d9d0ba795b88e (patch) | |
| tree | 40c8711a8b7155856ac41f9830abd24cd91ca2a0 /Mk | |
| parent | 34c563f34b4ddcfb1a17afc7ddd9eebce20ef5df (diff) | |
| download | freebsd-ports-gnome-68a619ff51d9185a365b280da45d9d0ba795b88e.tar.gz freebsd-ports-gnome-68a619ff51d9185a365b280da45d9d0ba795b88e.tar.zst freebsd-ports-gnome-68a619ff51d9185a365b280da45d9d0ba795b88e.zip | |
gecko: unbreak aarch64 build for non-empty CPUTYPE
As of Rust 1.22.1 the following CPUTYPEs are supported:
https://github.com/rust-lang/llvm/blob/c7a16bd57c2a/include/llvm/Support/AArch64TargetParser.def#L54-L77
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gecko.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index 9b337b478c47..62af409982f8 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -152,9 +152,15 @@ MOZ_EXPORT+= ${CONFIGURE_ENV} \ MOZ_OPTIONS+= --prefix="${PREFIX}" MOZ_MK_OPTIONS+=MOZ_OBJDIR="${MOZ_OBJDIR}" -RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} LDFLAGS+= -Wl,--as-needed +# Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk +.if ${ARCH} == amd64 || ${ARCH} == i386 +RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} +.else +RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} +.endif + .if ${MOZILLA_VER:R:R} < 55 && ${OPSYS} == FreeBSD && ${OSVERSION} < 1200032 # use jemalloc 3.0.0 (4.0 for firefox 43+) API for stats/tuning MOZ_EXPORT+= MOZ_JEMALLOC4=1 @@ -397,7 +403,7 @@ MOZ_OPTIONS+= --enable-debug --disable-release STRIP= # ports/184285 .else MOZ_OPTIONS+= --disable-debug --disable-debug-symbols --enable-release -. if ${MOZILLA_VER:R:R} >= 56 && (${MACHINE_CPU:Msse2} || ${ARCH:Maarch64}) +. if ${MOZILLA_VER:R:R} >= 56 && (${ARCH:Maarch64} || ${MACHINE_CPU:Msse2}) MOZ_OPTIONS+= --enable-rust-simd . endif .endif |