Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into...

[vuplus_openembedded] / classes / native.bbclass

diff --git a/classes/native.bbclass b/classes/native.bbclass
index 61048b6..69231e0 100644 (file)
--- a/classes/native.bbclass
+++ b/classes/native.bbclass
@@ -18,12 +18,14 @@ TARGET_OS = "${BUILD_OS}"
 TARGET_VENDOR = "${BUILD_VENDOR}"
 TARGET_PREFIX = "${BUILD_PREFIX}"
 TARGET_CC_ARCH = "${BUILD_CC_ARCH}"
+TARGET_EXEEXT = "${BUILD_EXEEXT}"
 
 HOST_ARCH = "${BUILD_ARCH}"
 HOST_OS = "${BUILD_OS}"
 HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_PREFIX = "${BUILD_PREFIX}"
 HOST_CC_ARCH = "${BUILD_CC_ARCH}"
+HOST_EXEEXT = "${BUILD_EXEEXT}"
 
 CPPFLAGS = "${BUILD_CPPFLAGS}"
 CFLAGS = "${BUILD_CFLAGS}"
@@ -80,14 +82,11 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
 do_stage () {
        if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
        then
-               if [ "${JAVA_NATIVE_STAGE_INSTALL}" = "1" ]
+               if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ]
                then
-                       java_stage
-               elif [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" = "1" ]
-               then
-                       autotools_stage_all
-               else
                        oe_runmake install
+               else
+                       autotools_stage_all
                fi
        fi
 }