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>

diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk
index 243cd0b66cc89d6fe2abd24c0a5445ff939ecf7f..298493c0f1df806385e6eaeef4cb970f5955eae2 100644 (file)
--- 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