From 4e2cf9af454da44c5245dad2f8b6be1d980da22f Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Mon, 21 Sep 2020 14:59:12 +0100 Subject: [PATCH] devtools: remove legacy flags from includes check Make is no longer supported, the test script for make builds is no longer required. Uses of make in other tool scripts are replaced. Signed-off-by: Ciara Power --- devtools/check-includes.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh index 749b9b26d2..940cf0eb2a 100755 --- a/devtools/check-includes.sh +++ b/devtools/check-includes.sh @@ -17,8 +17,7 @@ # # SUMMARY=1 is the same as -s. # -# CC, CPPFLAGS, CFLAGS, EXTRA_CPPFLAGS, EXTRA_CFLAGS, CXX, CXXFLAGS and -# EXTRA_CXXFLAGS are taken into account. +# CC, CPPFLAGS, CFLAGS, CXX, CXXFLAGS are taken into account. # # PEDANTIC_CFLAGS, PEDANTIC_CXXFLAGS and PEDANTIC_CPPFLAGS provide strict # C/C++ compilation flags. @@ -130,16 +129,16 @@ trap 'rm -f "$temp_cc" "$temp_cxx"' EXIT compile_cc () { ${CC} -I"$include_dir" \ - ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} ${EXTRA_CPPFLAGS} \ - ${PEDANTIC_CFLAGS} ${CFLAGS} ${EXTRA_CFLAGS} \ + ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} \ + ${PEDANTIC_CFLAGS} ${CFLAGS} \ -c -o /dev/null "${temp_cc}" } compile_cxx () { ${CXX} -I"$include_dir" \ - ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} ${EXTRA_CPPFLAGS} \ - ${PEDANTIC_CXXFLAGS} ${CXXFLAGS} ${EXTRA_CXXFLAGS} \ + ${PEDANTIC_CPPFLAGS} ${CPPFLAGS} \ + ${PEDANTIC_CXXFLAGS} ${CXXFLAGS} \ -c -o /dev/null "${temp_cxx}" } -- 2.20.1