sdk.bbclass: Revert recent changes for now

diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass
index 71c65a1..cbc1742 100644 (file)
--- a/classes/sdk.bbclass
+++ b/classes/sdk.bbclass
@@ -6,16 +6,15 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH}
 PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk"
 
 HOST_ARCH = "${BUILD_ARCH}"
-# This isn't BUILD_VENDOR since we don't want to clash with native staging
-HOST_VENDOR = "${TARGET_VENDOR}"
+HOST_VENDOR = "${BUILD_VENDOR}"
 HOST_OS = "${BUILD_OS}"
 HOST_PREFIX = "${BUILD_PREFIX}"
 HOST_CC_ARCH = "${BUILD_CC_ARCH}"
 
-CPPFLAGS = "${BUILDSDK_CPPFLAGS}"
-CFLAGS = "${BUILDSDK_CFLAGS}"
-CXXFLAGS = "${BUILDSDK_CFLAGS}"
-LDFLAGS = "${BUILDSDK_LDFLAGS}"
+CPPFLAGS = "${BUILD_CPPFLAGS}"
+CFLAGS = "${BUILD_CFLAGS}"
+CXXFLAGS = "${BUILD_CFLAGS}"
+LDFLAGS = "${BUILD_LDFLAGS}"
 
 # Path prefixes
 prefix = "${SDK_PREFIX}"