diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-06-14 20:26:04 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-14 20:26:04 +0000 |
| commit | 0ec23389f8d1ffe5e78d2b91f16a5b2d1202cabd (patch) | |
| tree | 1d1c315a271b098592c1dd1756b91a5117d85c1c | |
| parent | 8ef94e67c30efa29aa74956a981a9aee4a75dac9 (diff) | |
| download | upstream-0ec23389f8d1ffe5e78d2b91f16a5b2d1202cabd.tar.gz upstream-0ec23389f8d1ffe5e78d2b91f16a5b2d1202cabd.tar.bz2 upstream-0ec23389f8d1ffe5e78d2b91f16a5b2d1202cabd.zip | |
build: add a config option for choosing the prefered standard c++ library and add uclibc++.mk to make this easy to handle in packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32369 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Config.in | 15 | ||||
| -rw-r--r-- | include/package.mk | 2 | ||||
| -rw-r--r-- | include/uclibc++.mk | 12 |
3 files changed, 29 insertions, 0 deletions
diff --git a/Config.in b/Config.in index ddf02614b32..5f61905c929 100644 --- a/Config.in +++ b/Config.in @@ -395,6 +395,21 @@ menu "Global build settings" Note that this will 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_EGLIBC + 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 + endmenu menuconfig DEVEL diff --git a/include/package.mk b/include/package.mk index e955c207aee..abffa0c64cc 100644 --- a/include/package.mk +++ b/include/package.mk @@ -5,6 +5,8 @@ # See /LICENSE for more information. # +__package_mk:=1 + all: $(if $(DUMP),dumpinfo,compile) PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) diff --git a/include/uclibc++.mk b/include/uclibc++.mk new file mode 100644 index 00000000000..817484377fc --- /dev/null +++ b/include/uclibc++.mk @@ -0,0 +1,12 @@ +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),) + TARGET_CXX="g++-uc" +endif |