summaryrefslogtreecommitdiffstats
path: root/package/ruby
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-11-09 21:25:10 +0100
committerPeter Korsgaard <peter@korsgaard.com>2015-11-10 11:27:57 +0100
commitf364c1f8d9ab89a499b9e7f03272ca778a7e1750 (patch)
tree98f493cff6d1a5e8f4397d4022996e1ab533ae5c /package/ruby
parent5eb54fc0950825664824aa4ef100036efd3b5be6 (diff)
downloadbuildroot-f364c1f8d9ab89a499b9e7f03272ca778a7e1750.tar.gz
buildroot-f364c1f8d9ab89a499b9e7f03272ca778a7e1750.zip
ruby: do not overwrite RUBY_CONF_ENV
In commit 53bf889cdca77979814bc6b74170e2f104fc3b70 ("ruby: should not use dl_iterate_phdr() on Blackfin") we added ac_cv_func_dl_iterate_phdr=no to RUBY_CONF_ENV when building on the Blackfin architecture. However, while doing so, we overwrote the previous value of RUBY_CONF_ENV, which was defined to have custom CFLAGS: RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)" This has no visible effect because the custom CFLAGS are only used on SuperH/SuperH 64, while the overwrite of RUBY_CONF_ENV takes place on Blackfin. However, it doesn't look very pretty, and future additions to RUBY_CONF_ENV may break this subtle behavior. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ruby')
-rw-r--r--package/ruby/ruby.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 243cd0b66c..298493c0f1 100644
--- a/package/ruby/ruby.mk
+++ b/package/ruby/ruby.mk
@@ -30,7 +30,7 @@ endif
RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)"
ifeq ($(BR2_bfin),y)
-RUBY_CONF_ENV = ac_cv_func_dl_iterate_phdr=no
+RUBY_CONF_ENV += ac_cv_func_dl_iterate_phdr=no
# Blackfin doesn't have FFI closure support, needed by the fiddle
# extension.
RUBY_CONF_OPTS += --with-out-ext=fiddle
OpenPOWER on IntegriCloud