From a11ffb64f526527c28513547559416f230a75568 Mon Sep 17 00:00:00 2001
From: Michael McMahon <michael.steven.mcmahon@gmail.com>
Date: Tue, 14 Nov 2017 16:14:52 -0500
Subject: [PATCH] Removed hardcoded CFLAGS

---
 src/minimal_overlay/bundles/nano/02_build.sh    | 5 ++---
 src/minimal_overlay/bundles/ncurses/02_build.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/minimal_overlay/bundles/nano/02_build.sh b/src/minimal_overlay/bundles/nano/02_build.sh
index b63a4208a..9480712e5 100755
--- a/src/minimal_overlay/bundles/nano/02_build.sh
+++ b/src/minimal_overlay/bundles/nano/02_build.sh
@@ -18,9 +18,8 @@ rm -rf $DESTDIR
 
 echo "Configuring nano..."
 CFLAGS="$CFLAGS" ./configure \
-    --prefix=/usr
-    --disable-utf8 \
-    CFLAGS="-Os -s -fno-stack-protector -U_FORTIFY_SOURCE"
+    --prefix=/usr \
+    LDFLAGS=-L$WORK_DIR/overlay/ncurses/ncurses_installed/usr/include
 
 echo "Building nano..."
 make -j $NUM_JOBS
diff --git a/src/minimal_overlay/bundles/ncurses/02_build.sh b/src/minimal_overlay/bundles/ncurses/02_build.sh
index dfe151ca1..3362c6a6a 100755
--- a/src/minimal_overlay/bundles/ncurses/02_build.sh
+++ b/src/minimal_overlay/bundles/ncurses/02_build.sh
@@ -22,7 +22,7 @@ sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
 
 # Configure Ncurses
 echo "Configuring Ncurses..."
-./configure \
+CFLAGS="$CFLAGS" ./configure \
     --prefix=/usr \
     --with-termlib \
     --with-terminfo-dirs=/lib/terminfo \
@@ -36,7 +36,6 @@ echo "Configuring Ncurses..."
     --with-shared \
     CPPFLAGS=-I$PWD/ncurses/widechar \
     LDFLAGS=-L$PWD/lib \
-    CFLAGS="-Os -s -fno-stack-protector -U_FORTIFY_SOURCE" \
     CPPFLAGS="-P"
 
 # Most configuration switches are from AwlsomeAlex
@@ -68,3 +67,4 @@ cp -r $DESTDIR/usr/* $ROOTFS
 echo "ncurses has been installed."
 
 cd $SRC_DIR
+