From be2203be68166880c0dcc67e06a5cc96995c98b7 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Mon, 9 Nov 2015 18:36:52 -0800
Subject: Pass CFLAGS/LDFLAGS to backends.

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/scripts/build/companion_libs/210-expat.sh b/scripts/build/companion_libs/210-expat.sh
index 25a69d3..17acf29 100644
--- a/scripts/build/companion_libs/210-expat.sh
+++ b/scripts/build/companion_libs/210-expat.sh
@@ -26,7 +26,9 @@ do_expat_for_host() {
     CT_mkdir_pushd "${CT_BUILD_DIR}/build-expat-host-${CT_HOST}"
 
     do_expat_backend host="${CT_HOST}" \
-                     prefix="${CT_HOST_COMPLIBS_DIR}"
+                     prefix="${CT_HOST_COMPLIBS_DIR}" \
+                     cflags="${CT_CFLAGS_FOR_HOST}" \
+                     ldflags="${CT_LDFLAGS_FOR_HOST}"
 
     CT_Popd
     CT_EndStep
@@ -66,6 +68,8 @@ do_expat_backend() {
     CT_DoLog EXTRA "Configuring expat"
 
     CT_DoExecLog CFG                                                \
+    CFLAGS="${cflags}"                                              \
+    LDFLAGS="${ldflags}"                                            \
     "${CT_SRC_DIR}/expat-${CT_EXPAT_VERSION}/configure"             \
         --build=${CT_BUILD}                                         \
         --host=${host}                                              \
diff --git a/scripts/build/companion_libs/220-ncurses.sh b/scripts/build/companion_libs/220-ncurses.sh
index 2011a65..176e99f 100644
--- a/scripts/build/companion_libs/220-ncurses.sh
+++ b/scripts/build/companion_libs/220-ncurses.sh
@@ -34,6 +34,8 @@ do_ncurses_for_build() {
           "--without-ada")
     do_ncurses_backend host="${CT_BUILD}" \
                        destdir="${CT_BUILDTOOLS_PREFIX_DIR}" \
+                       cflags="${CT_CFLAGS_FOR_BUILD}" \
+                       ldflags="${CT_LDFLAGS_FOR_BUILD}" \
                        "${opts[@]}"
     CT_Popd
     CT_EndStep
@@ -60,6 +62,8 @@ do_ncurses_for_host() {
           "--without-ada")
     do_ncurses_backend host="${CT_HOST}" \
                        prefix="${CT_HOST_COMPLIBS_DIR}" \
+                       cflags="${CT_CFLAGS_FOR_HOST}" \
+                       ldflags="${CT_LDFLAGS_FOR_HOST}" \
                        "${opts[@]}"
     CT_Popd
     CT_EndStep
@@ -120,6 +124,8 @@ do_ncurses_backend() {
 
     CT_DoLog EXTRA "Configuring ncurses"
     CT_DoExecLog CFG                                                    \
+    CFLAGS="${cflags}"                                                  \
+    LDFLAGS="${ldflags}"                                                \
     "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure"             \
         --build=${CT_BUILD}                                             \
         --host=${host}                                                  \
-- 
cgit v0.10.2-6-g49f6