diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk
index 6d761ad678..c2a4108f35 100644
--- a/package/tiff/tiff.mk
+++ b/package/tiff/tiff.mk
@@ -14,7 +14,6 @@ TIFF_INSTALL_STAGING = YES
 
 TIFF_CONF_OPTS = \
 	--disable-contrib \
-	--disable-cxx \
 	--disable-tests \
 	--without-x
 
@@ -29,6 +28,12 @@ HOST_TIFF_CONF_OPTS = \
 	--disable-tests
 HOST_TIFF_DEPENDENCIES = host-pkgconf
 
+ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+TIFF_CONF_OPTS += --enable-cxx
+else
+TIFF_CONF_OPTS += --disable-cxx
+endif
+
 ifneq ($(BR2_PACKAGE_TIFF_CCITT),y)
 TIFF_CONF_OPTS += --disable-ccitt
 endif