Changeset View
Changeset View
Standalone View
Standalone View
Mk/bsd.gecko.mk
Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines | MOZ_EXPORT+= ${CONFIGURE_ENV} \ | ||||
RUSTFLAGS="${RUSTFLAGS}" | RUSTFLAGS="${RUSTFLAGS}" | ||||
MOZ_OPTIONS+= --prefix="${PREFIX}" | MOZ_OPTIONS+= --prefix="${PREFIX}" | ||||
MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}" | MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}" | ||||
MOZ_OPTIONS+= --with-libclang-path="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" | MOZ_OPTIONS+= --with-libclang-path="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" | ||||
. if !exists(/usr/bin/llvm-objdump) | . if !exists(/usr/bin/llvm-objdump) | ||||
MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" | MOZ_EXPORT+= LLVM_OBJDUMP="${LOCALBASE}/bin/llvm-objdump${LLVM_DEFAULT}" | ||||
. endif | . endif | ||||
# Keep in sync with devel/wasi-* ports | |||||
WASI_LLVM_DEFAULT= 14 | |||||
WASI_LLVM_VERSION= 14.0.2 | |||||
tcberner: ^why change it to 14 in one go?
This looks like two changes
1) make the variables available in… | |||||
fluffyUnsubmitted Not Done Inline Actions14 because of wasi-libcxx which is also bumped to latest llvm sources, I assume :) fluffy: 14 because of wasi-libcxx which is also bumped to latest llvm sources, I assume :) | |||||
# Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled | # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled | ||||
. if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} | . if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} | ||||
LLVM_DEFAULT= 13 # chase bundled LLVM in lang/rust for LTO | LLVM_DEFAULT= ${WASI_LLVM_DEFAULT} # chase devel/wasi-* and bundled LLVM in lang/rust for LTO | ||||
LLVM_VERSION= 13.0.1 # keep in sync with devel/wasi-compiler-rt${LLVM_DEFAULT} | |||||
. endif | . endif | ||||
# Require newer Clang than what's in base system unless user opted out | # Require newer Clang than what's in base system unless user opted out | ||||
. if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) | . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) | ||||
BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} | BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} | ||||
CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} | CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} | ||||
CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} | CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} | ||||
CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} | CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} | ||||
USES:= ${USES:Ncompiler\:*} # XXX avoid warnings | USES:= ${USES:Ncompiler\:*} # XXX avoid warnings | ||||
▲ Show 20 Lines • Show All 299 Lines • Show Last 20 Lines |
^why change it to 14 in one go?
This looks like two changes