From cb3d782897b23ad5975808951aa650a957eb92b2 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 9 Jan 2020 03:07:28 -0800
Subject: [PATCH] makefile: Add support for extra library directories on
 Android (termux)

- removed warning suppression for unused-result and format-truncation
---
 makefile | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/makefile b/makefile
index b7072026..7e86795a 100644
--- a/makefile
+++ b/makefile
@@ -319,6 +319,9 @@ ifeq (${WIN32},)  #*nix Environments (&& cygwin)
         endif
         ifneq (lib,$(findstring lib,$(UNSUPPORTED_BUILD)))
           ifeq (Android,$(shell uname -o))
+            ifneq (,$(shell if ${TEST} -d ${PREFIX}/lib; then echo prefixlib; fi))
+              LIBPATH += ${PREFIX}/lib
+            endif
             ifneq (,$(shell if ${TEST} -d /system/lib; then echo systemlib; fi))
               LIBPATH += /system/lib
             endif
@@ -1192,12 +1195,6 @@ ifneq (3,$(GCC_MAJOR_VERSION))
   ifeq (,$(GCC_WARNINGS_CMD))
     GCC_WARNINGS_CMD = ${GCC} --help=warnings
   endif
-  ifneq (,$(findstring -Wunused-result,$(shell $(GCC_WARNINGS_CMD))))
-    CFLAGS_O += -Wno-unused-result
-  endif
-  ifneq (,$(findstring -Wformat-truncation,$(shell $(GCC_WARNINGS_CMD))))
-    CFLAGS_O += -Wno-format-truncation
-  endif
 endif
 ifneq (clean,${MAKECMDGOALS})
   BUILD_FEATURES := $(BUILD_FEATURES). $(COMPILER_NAME)