From: Baruch Siach Date: Tue, 17 Apr 2018 04:00:28 +0000 (+0300) Subject: usb_modeswitch: set CXX to false when C++ is missing X-Git-Tag: 2018.02.2~44 X-Git-Url: https://rtime.felk.cvut.cz/gitweb/coffee/buildroot.git/commitdiff_plain/b058d288ef1d0150c368647cc1ada6dfead24f6c usb_modeswitch: set CXX to false when C++ is missing 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" Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 107e3ebf45931adfc9c995dbb5db3bf1d17311d3) Signed-off-by: Peter Korsgaard --- diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index c67d4cd583..8dd712f264 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -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)