From mboxrd@z Thu Jan 1 00:00:00 1970 From: Baruch Siach Date: Thu, 25 Oct 2018 06:57:06 +0300 Subject: [Buildroot] [PATCH v3, 1/1] bdwgc: add optional cplusplus support In-Reply-To: <20181024210136.8375-1-fontaine.fabrice@gmail.com> References: <20181024210136.8375-1-fontaine.fabrice@gmail.com> Message-ID: <87pnvy7k6l.fsf@tkos.co.il> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hi Fabrice, Fabrice Fontaine writes: > Use CFLAGS_EXTRA to pass C and C++ flags in a single variable > > Signed-off-by: Fabrice Fontaine > --- > Changes v2 -> v3 (after review of Baruch Siach): > - Replace BDWGC_CFLAGS by BDWGC_CFLAGS_EXTRA > > Changes v1 -> v2 (after review of Arnout Vandecappelle and Baruch > Siach): > - Use CFLAGS_EXTRA to pass C and C++ flags in a single variable instead > of using CFLAGS and CPPFLAGS > > package/bdwgc/bdwgc.mk | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/package/bdwgc/bdwgc.mk b/package/bdwgc/bdwgc.mk > index 5603df8d9d..1c80f47b92 100644 > --- a/package/bdwgc/bdwgc.mk > +++ b/package/bdwgc/bdwgc.mk > @@ -19,17 +19,24 @@ HOST_BDWGC_DEPENDENCIES = host-libatomic_ops host-pkgconf > # solution. > BDWGC_AUTORECONF = YES > > -BDWGC_CFLAGS = $(TARGET_CFLAGS) This removes TARGET_CLAGS ... > ifeq ($(BR2_sparc),y) > -BDWGC_CFLAGS += -DAO_NO_SPARC_V9 > +BDWGC_CFLAGS_EXTRA += -DAO_NO_SPARC_V9 > endif > ifeq ($(BR2_STATIC_LIBS),y) > -BDWGC_CFLAGS += -DGC_NO_DLOPEN > +BDWGC_CFLAGS_EXTRA += -DGC_NO_DLOPEN > endif > > +BDWGC_CONF_OPTS = CFLAGS_EXTRA="$(BDWGC_CFLAGS_EXTRA)" ... so you need to add it back here. Nit: I'd move the BDWGC_CONF_OPTS assignment upper. baruch > + > # Ensure we use the system libatomic_ops, and not the internal one. > -BDWGC_CONF_OPTS = --with-libatomic-ops=yes CFLAGS="$(BDWGC_CFLAGS)" > +BDWGC_CONF_OPTS += --with-libatomic-ops=yes > HOST_BDWGC_CONF_OPTS = --with-libatomic-ops=yes > > +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) > +BDWGC_CONF_OPTS += --enable-cplusplus > +else > +BDWGC_CONF_OPTS += --disable-cplusplus > +endif > + > $(eval $(autotools-package)) > $(eval $(host-autotools-package)) -- http://baruch.siach.name/blog/ ~. .~ Tk Open Systems =}------------------------------------------------ooO--U--Ooo------------{= - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -