Skip to content

Commit 8444e30

Browse files
author
Pavel Marek
committed
Build cluster from different location than gnur directory
(cherry picked from commit 14569880b45f12420278ff0fa8340cefd9cfba7c)
1 parent e9aa4e7 commit 8444e30

File tree

1 file changed

+2
-1
lines changed
  • com.oracle.truffle.r.native.recommended

1 file changed

+2
-1
lines changed

com.oracle.truffle.r.native.recommended/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ GNUR_RECOMMENDED_PKGNAMES_TS = $(GNUR_RECOMMENDED_PKGNAMES:=.ts)
7171
# Recommended packages that are used by fastr in a specific version, i.e., taken from other sources than GNUR_RECOMMENDED_BINARY
7272
PKGS_WITH_CUSTOM_VERSION := cluster rpart
7373
RPART_TAR := $(FASTR_R_HOME)/libdownloads/rpart.tar.gz
74+
CLUSTER_TAR := $(FASTR_R_HOME)/libdownloads/cluster.tar.gz
7475

7576
GNUR_RECOMMENDED_TAR_DIR = $(GNUR_HOME_BINARY_UNPACKED)/src/library/Recommended/
7677
# We do not copy all the recommended packages from gnur's directory. Instead, there are some
@@ -80,7 +81,7 @@ $(foreach pkg, \
8081
$(filter-out $(PKGS_WITH_CUSTOM_VERSION),$(GNUR_RECOMMENDED_PKGNAMES)), \
8182
$(GNUR_RECOMMENDED_TAR_DIR)/$(pkg)*.tar.gz \
8283
)
83-
ALL_RECOMMENDED_TARS := $(GNUR_RECOMMENDED_TARS) $(RPART_TAR)
84+
ALL_RECOMMENDED_TARS := $(GNUR_RECOMMENDED_TARS) $(RPART_TAR) $(CLUSTER_TAR)
8485

8586
## need to allow parallel installs
8687
INSTALL_OPTS = --pkglock --data-compress=xz --no-staged-install

0 commit comments

Comments
 (0)