File tree Expand file tree Collapse file tree 1 file changed +7
-1
lines changed
com.oracle.truffle.r.native/gnur Expand file tree Collapse file tree 1 file changed +7
-1
lines changed Original file line number Diff line number Diff line change @@ -111,6 +111,12 @@ else
111111CONFIGURE_CC := ""
112112endif
113113
114+ ifdef FASTR_CXX
115+ CONFIGURE_CXX := "CXX=$(FASTR_CXX)"
116+ else
117+ CONFIGURE_CXX := ""
118+ endif
119+
114120GNUR_HOME_BINARY_UNPACKED_PARENT := $(dir $(GNUR_HOME_BINARY_UNPACKED))
115121GNUR_CONFIG_LOG = $(GNUR_HOME_BINARY_UNPACKED)/gnur_configure.log
116122GNUR_MAKE_LOG = $(GNUR_HOME_BINARY_UNPACKED)/gnur_make.log
@@ -123,7 +129,7 @@ $(GNUR_HOME_BINARY_UNPACKED)/gnur.done:
123129 rm -rf $(GNUR_HOME_BINARY_UNPACKED)
124130 mkdir -p $(GNUR_HOME_BINARY_UNPACKED_PARENT)
125131 (cd $(GNUR_HOME_BINARY_UNPACKED_PARENT); tar xf R-$(R_VERSION).tar.gz)
126- (cd $(GNUR_HOME_BINARY_UNPACKED); ./configure --with-x=no --with-aqua=no --with-pcre2 $(RECPKGS) $(OS_EXTRA_CONFIGURE_FLAGS) $(CONFIGURE_FC) $(CONFIGURE_CC) --enable-memory-profiling $(GNUR_CONFIG_FLAGS) > $(GNUR_CONFIG_LOG) 2>&1; $(MAKE) -j > $(GNUR_MAKE_LOG) 2>&1) || ((tail -n 50 $(GNUR_CONFIG_LOG) $(GNUR_MAKE_LOG) || true) && exit 1)
132+ (cd $(GNUR_HOME_BINARY_UNPACKED); ./configure --with-x=no --with-aqua=no --with-pcre2 $(RECPKGS) $(OS_EXTRA_CONFIGURE_FLAGS) $(CONFIGURE_FC) $(CONFIGURE_CC) $(CONFIGURE_CXX) --enable-memory-profiling $(GNUR_CONFIG_FLAGS) > $(GNUR_CONFIG_LOG) 2>&1; $(MAKE) -j > $(GNUR_MAKE_LOG) 2>&1) || ((tail -n 50 $(GNUR_CONFIG_LOG) $(GNUR_MAKE_LOG) || true) && exit 1)
127133 touch $(GNUR_HOME_BINARY_UNPACKED)/gnur.done
128134else
129135$(GNUR_HOME_BINARY_UNPACKED)/gnur.done:
You can’t perform that action at this time.
0 commit comments