summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-01-10 18:46:57 (GMT)
committerGitHub <noreply@github.com>2017-01-10 18:46:57 (GMT)
commit50aa6b583b89b2f4c031e581dda15051d1c2f721 (patch)
treefaf6c28589d312ef9be24fb448433cfcc5c05aa7 /config
parentabdaa36b5ab0a46055248bc437d0f74183984d78 (diff)
parentc69e593a9272ad186b6669bc5b12886890cea7fe (diff)
Merge pull request #510 from stilor/pass-flags-for-build
Pass flags for build & MacOS fixes.
Diffstat (limited to 'config')
-rw-r--r--config/cc/gcc.in2
-rw-r--r--config/companion_libs.in8
-rw-r--r--config/toolchain.in1
3 files changed, 8 insertions, 3 deletions
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index a98b9f1..7808241 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -1,7 +1,7 @@
# Compiler options
#
## default y
-## select CC_SUPPORT_CXX
+## select CC_SUPPORT_CXX if !LIBC_none
## select CC_SUPPORT_FORTRAN
## select CC_SUPPORT_JAVA
## select CC_SUPPORT_ADA
diff --git a/config/companion_libs.in b/config/companion_libs.in
index 67094cb..7d1d4f7 100644
--- a/config/companion_libs.in
+++ b/config/companion_libs.in
@@ -62,11 +62,15 @@ config COMPLIBS
bool
config LIBICONV
- bool
+ bool "Build local libiconv"
+ default y if CANADIAN || CROSS_NATIVE
select COMPLIBS
config GETTEXT
- bool
+ bool "Build local gettext"
+ default y if CANADIAN || CROSS_NATIVE
+ select LIBICONV_NEEDED
+ select NCURSES_NEEDED
select COMPLIBS
config GMP
diff --git a/config/toolchain.in b/config/toolchain.in
index ca74ee7..b8c1b4a 100644
--- a/config/toolchain.in
+++ b/config/toolchain.in
@@ -308,6 +308,7 @@ comment "Misc options"
config TOOLCHAIN_ENABLE_NLS
bool
prompt "Enable nls"
+ select GETTEXT_NEEDED
help
Say 'Y' here to enable native language support (nls).