| diff --git a/config/Config-build.in b/config/Config-build.in |
| index 342859b..c72ba74 100644 |
| --- a/config/Config-build.in |
| +++ b/config/Config-build.in |
| @@ -217,20 +217,6 @@ menu "Global build settings" |
| make the system libraries incompatible with most of the packages that are |
| not selected during the build process. |
| |
| - choice |
| - prompt "Preferred standard C++ library" |
| - default USE_LIBSTDCXX if USE_GLIBC |
| - default USE_UCLIBCXX |
| - help |
| - Select the preferred standard C++ library for all packages that support this. |
| - |
| - config USE_UCLIBCXX |
| - bool "uClibc++" |
| - |
| - config USE_LIBSTDCXX |
| - bool "libstdc++" |
| - endchoice |
| - |
| comment "Hardening build options" |
| |
| config PKG_CHECK_FORMAT_SECURITY |
| diff --git a/include/uclibc++.mk b/include/uclibc++.mk |
| index a1a61f2..10f8d98 100644 |
| --- a/include/uclibc++.mk |
| +++ b/include/uclibc++.mk |
| @@ -1,16 +1,2 @@ |
| -ifndef DUMP |
| - ifdef __package_mk |
| - $(error uclibc++.mk must be included before package.mk) |
| - endif |
| -endif |
| - |
| -PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX |
| -CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp |
| - |
| -ifneq ($(CONFIG_USE_UCLIBCXX),) |
| - ifneq ($(CONFIG_CCACHE),) |
| - TARGET_CXX_NOCACHE=g++-uc |
| - else |
| - TARGET_CXX=g++-uc |
| - endif |
| -endif |
| +$(warn uclibc++.mk is deprecated. Please remove it and CXX_DEPENDS) |
| +CXX_DEPENDS = +libstdcpp |