]> rtime.felk.cvut.cz Git - coffee/buildroot.git/commitdiff
usb_modeswitch: set CXX to false when C++ is missing
authorBaruch Siach <baruch@tkos.co.il>
Tue, 17 Apr 2018 04:00:28 +0000 (07:00 +0300)
committerPeter Korsgaard <peter@korsgaard.com>
Mon, 30 Apr 2018 20:51:36 +0000 (22:51 +0200)
Similar to the openocd fix in commit 5966e2dc54 (package/openocd: fix
fallout after no-C++ fixups) the jimctl that is bundled with
usb_modeswitch also wants to find a binary. This broke with commit
4cd1ab158 (core: alternate solution to disable C++). Revert to 'false'
instead of 'no' here as well.

Fixes:
http://autobuild.buildroot.net/results/b4d/b4d4e925763cb6558af915f9781afe07fc557ebc/
http://autobuild.buildroot.net/results/61b/61b9dc2148df2e8fd0b30e62aedbfd30bb755e19/
http://autobuild.buildroot.net/results/468/468a7e6b049f159fbb4e79d3a12b53ca890f6933/

Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 107e3ebf45931adfc9c995dbb5db3bf1d17311d3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/usb_modeswitch/usb_modeswitch.mk

index c67d4cd58312dab7f86ba69cfd87538aec50f8f0..8dd712f264b235788b03db5fcbff9ac8191d1b4a 100644 (file)
@@ -28,6 +28,7 @@ USB_MODESWITCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
 
 define USB_MODESWITCH_BUILD_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+               $(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
                CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \
                JIM_CONFIGURE_OPTS="--host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME)" \
                -C $(@D) $(USB_MODESWITCH_BUILD_TARGETS)