From 4ce48fc554d9beaf8890b37214451993150cda39 Mon Sep 17 00:00:00 2001 From: Mick Jordan <mick.jordan@oracle.com> Date: Thu, 22 Oct 2015 15:09:10 -0700 Subject: [PATCH] remove alt GNUR_HOME feature (no longer works) --- com.oracle.truffle.r.native/Makefile | 6 ------ com.oracle.truffle.r.native/gnur/Makefile | 8 -------- 2 files changed, 14 deletions(-) diff --git a/com.oracle.truffle.r.native/Makefile b/com.oracle.truffle.r.native/Makefile index 9c24dba8b6..f44d911756 100644 --- a/com.oracle.truffle.r.native/Makefile +++ b/com.oracle.truffle.r.native/Makefile @@ -27,13 +27,7 @@ export TOPDIR = $(CURDIR) export R_VERSION = 3.1.3 - -ifndef GNUR_HOME export GNUR_HOME = $(TOPDIR)/gnur/R-$(R_VERSION) -export GNUR_HOME_ORIGIN = local -else -export GNUR_HOME_ORIGIN = environment -endif all: $(MAKE) -C gnur diff --git a/com.oracle.truffle.r.native/gnur/Makefile b/com.oracle.truffle.r.native/gnur/Makefile index 90ee209245..8b03467838 100644 --- a/com.oracle.truffle.r.native/gnur/Makefile +++ b/com.oracle.truffle.r.native/gnur/Makefile @@ -27,20 +27,12 @@ all: makegnur $(MAKE) -f Makefile.platform $(MAKE) -f Makefile.libs -ifeq ($(GNUR_HOME_ORIGIN), environment) -makegnur: -else makegnur: $(MAKE) -f Makefile.gnur -endif clean: cleangnur $(MAKE) -f Makefile.libs clean $(MAKE) -f Makefile.platform clean -ifeq ($(GNUR_HOME_ORIGIN), environment) -cleangnur: -else cleangnur: $(MAKE) -f Makefile.gnur clean -endif -- GitLab