net-tools: correctly set COPTS and LOPTS

COPTS will be ignored if it is defined in the environment.
It must be passed directly to make.  To be consistent, we
pass LOPTS that way, too.

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
(cherry picked from commit dede6d3d37aab72ae897c3709d21108fa75f6673)
Signed-off-by: Armin Kuster <akuster808@gmail.com>

diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
index c23d53376a940d453c410d9a29f66fe783d3523b..69c9af317daf2b197fc8aa2e07e0b2b148f221f3 100644 (file)
--- a/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
+++ b/meta/recipes-extended/net-tools/net-tools_1.60-26.bb
@@ -81,20 +81,12 @@ do_configure() {
 
 do_compile() {
        # net-tools use COPTS/LOPTS to allow adding custom options
-       export COPTS="$CFLAGS"
-       export LOPTS="$LDFLAGS"
-       unset CFLAGS
-       unset LDFLAGS
-
-       oe_runmake
+       oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS"
 }
 
 do_install() {
-       export COPTS="$CFLAGS"
-       export LOPTS="$LDFLAGS"
-       unset CFLAGS
-       unset LDFLAGS
-       oe_runmake 'BASEDIR=${D}' install
+       # We don't need COPTS or LOPTS, but let's be consistent.
+       oe_runmake COPTS="$CFLAGS" LOPTS="$LDFLAGS" 'BASEDIR=${D}' install
 
        if [ "${base_bindir}" != "/bin" ]; then
                mkdir -p ${D}/${base_bindir}