Merge pull request #607 from stilor/ncurses-more

Add --disable-database and --with-fallbacks separately
crosstool-ng · Feb 20, 2017 · abcb548 · abcb548
2 parents eb8c902 + a417c31
commit abcb548
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh
@@ -39,7 +39,10 @@ do_ncurses_for_build() {
     case "${CT_TOOLCHAIN_TYPE}" in
         native|cross)
             if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
-                opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
+                opts+=( "--disable-database" )
+            fi
+            if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
+                opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
             fi
             opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
             ;;
@@ -73,7 +76,10 @@ do_ncurses_for_host() {
           "--without-cxx-binding" \
           "--without-ada" )
     if [ "${CT_NCURSES_HOST_DISABLE_DB}" = "y" ]; then
-        opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
+        opts+=( "--disable-database" )
+    fi
+    if [ -n "${CT_NCURSES_HOST_FALLBACKS}" ]; then
+        opts+=( "--with-fallbacks=${CT_NCURSES_HOST_FALLBACKS}" )
     fi
     opts+=( "${CT_NCURSES_HOST_CONFIG_ARGS[@]}" )
     do_ncurses_backend host="${CT_HOST}" \
@@ -96,7 +102,10 @@ do_ncurses_for_target() {
     [ "${CT_CC_LANG_CXX}" = "y" ] || opts+=("--without-cxx" "--without-cxx-binding")
     [ "${CT_CC_LANG_ADA}" = "y" ] || opts+=("--without-ada")
     if [ "${CT_NCURSES_TARGET_DISABLE_DB}" = "y" ]; then
-        opts+=( "--disable-database" "--with-fallbacks=${CT_NCURSES_TARGET_FALLBACKS}" )
+        opts+=( "--disable-database" )
+    fi
+    if [ -n "${CT_NCURSES_TARGET_FALLBACKS}" ]; then
+        opts+=( "--with-fallbacks=${CT_NCURSES_TARGET_FALLBACKS}" )
     fi
     opts+=( "${CT_NCURSES_TARGET_CONFIG_ARGS[@]}" )
     case "${CT_TARGET}" in