diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2019-03-21 05:40:03 +0800 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2019-03-21 05:40:03 +0800 |
| commit | de573c18c18c7bcb3540f582885f3831a1c21636 (patch) | |
| tree | 2ad2c7b012c8a460557c8052da928f5e8a74247d /lang | |
| parent | d2a6dd1a4265fc45838ad9a7dae7a26dca0716a1 (diff) | |
| download | freebsd-ports-gnome-de573c18c18c7bcb3540f582885f3831a1c21636.tar.gz freebsd-ports-gnome-de573c18c18c7bcb3540f582885f3831a1c21636.tar.zst freebsd-ports-gnome-de573c18c18c7bcb3540f582885f3831a1c21636.zip | |
Switch to LLVM_DEFAULT from an hardcoded llvm40.
This removes the LLVM40 option.
PR: 236477, 231286
Approved by: ashish (maintainer)
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/rubinius/Makefile | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile index 6600e4712b05..7be93b6fbdb1 100644 --- a/lang/rubinius/Makefile +++ b/lang/rubinius/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/bundle:sysutils/rubygem-bundler \ ${LOCALBASE}/bin/bison:devel/bison \ - ${LLVM_CONFIG_PATH}:${LLVM_PORT} + ${LLVM_CONFIG_PATH}:devel/llvm${LLVM_DEFAULT} LIB_DEPENDS= libyaml.so:textproc/libyaml HAS_CONFIGURE= yes @@ -36,14 +36,8 @@ CONFIGURE_ARGS= -P "${PREFIX}" \ --stagingdir "${STAGEDIR}${PREFIX}" --with-execinfo \ --system-name ${OPSYS} -OPTIONS_RADIO= LLVM -OPTIONS_DEFAULT= LLVM40 -OPTIONS_RADIO_LLVM= LLVM40 - ONLY_FOR_ARCHS= amd64 -LLVM40_DESC= LLVM 4.0 - USES= gmake perl5 readline tar:bzip2 libedit ssl USE_LOCALE= en_US.UTF-8 USE_RUBY= yes @@ -68,14 +62,9 @@ MAKE_ENV+= GEM_PATH=${GEM_PATH} F_OS= ${OPSYS:tl} F_MAJOR= ${OSREL:C/\..*$//} FREEBSD_DIR= ${F_ARCH}-${F_OS}-${F_MAJOR} -LLVM_CC_PATH= ${LOCALBASE}/bin/${LLVM_CC} -LLVM_CXX_PATH= ${LOCALBASE}/bin/${LLVM_CXX} -LLVM_CONFIG_PATH= ${LOCALBASE}/bin/${LLVM_CONFIG} - -LLVM40_VARS= LLVM_CONFIG=llvm-config40 \ - LLVM_PORT=devel/llvm40 \ - LLVM_CC=clang40 \ - LLVM_CXX=clang++40 +LLVM_CC_PATH= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} +LLVM_CXX_PATH= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} +LLVM_CONFIG_PATH= ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} .include <bsd.port.pre.mk> |