| developer | 551157a | 2021-11-02 12:19:47 +0800 | [diff] [blame] | 1 | diff --git a/config/Config-build.in b/config/Config-build.in |
| 2 | index 342859b..c72ba74 100644 |
| 3 | --- a/config/Config-build.in |
| 4 | +++ b/config/Config-build.in |
| 5 | @@ -217,20 +217,6 @@ menu "Global build settings" |
| 6 | make the system libraries incompatible with most of the packages that are |
| 7 | not selected during the build process. |
| 8 | |
| 9 | - choice |
| 10 | - prompt "Preferred standard C++ library" |
| 11 | - default USE_LIBSTDCXX if USE_GLIBC |
| 12 | - default USE_UCLIBCXX |
| 13 | - help |
| 14 | - Select the preferred standard C++ library for all packages that support this. |
| 15 | - |
| 16 | - config USE_UCLIBCXX |
| 17 | - bool "uClibc++" |
| 18 | - |
| 19 | - config USE_LIBSTDCXX |
| 20 | - bool "libstdc++" |
| 21 | - endchoice |
| 22 | - |
| 23 | comment "Hardening build options" |
| 24 | |
| 25 | config PKG_CHECK_FORMAT_SECURITY |
| 26 | diff --git a/include/uclibc++.mk b/include/uclibc++.mk |
| 27 | index a1a61f2..10f8d98 100644 |
| 28 | --- a/include/uclibc++.mk |
| 29 | +++ b/include/uclibc++.mk |
| 30 | @@ -1,16 +1,2 @@ |
| 31 | -ifndef DUMP |
| 32 | - ifdef __package_mk |
| 33 | - $(error uclibc++.mk must be included before package.mk) |
| 34 | - endif |
| 35 | -endif |
| 36 | - |
| 37 | -PKG_PREPARED_DEPENDS += CONFIG_USE_UCLIBCXX |
| 38 | -CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp |
| 39 | - |
| 40 | -ifneq ($(CONFIG_USE_UCLIBCXX),) |
| 41 | - ifneq ($(CONFIG_CCACHE),) |
| 42 | - TARGET_CXX_NOCACHE=g++-uc |
| 43 | - else |
| 44 | - TARGET_CXX=g++-uc |
| 45 | - endif |
| 46 | -endif |
| 47 | +$(warn uclibc++.mk is deprecated. Please remove it and CXX_DEPENDS) |
| 48 | +CXX_DEPENDS = +libstdcpp |