summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaruch Siach <baruch@tkos.co.il>2018-04-17 04:00:28 (GMT)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2018-04-17 06:45:42 (GMT)
commit107e3ebf45931adfc9c995dbb5db3bf1d17311d3 (patch)
tree56e480a9c59780a96882f04ec124b71917c10007
parentb661a5477efe53a2fd1029ccfd44733e5d269632 (diff)
downloadbuildroot-107e3ebf45931adfc9c995dbb5db3bf1d17311d3.tar.gz
buildroot-107e3ebf45931adfc9c995dbb5db3bf1d17311d3.tar.bz2
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" <yann.morin.1998@free.fr> Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/usb_modeswitch/usb_modeswitch.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
index 8e6b433..d0c33cc 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)