summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2023-07-13 09:54:46 -0600
committerJoshua Watt <JPEWhacker@gmail.com>2023-07-13 12:34:00 -0600
commit92258028e1b5664a9f832541d5c4f6de0bd05e07 (patch)
treeb5be17fd7ab192f1f771c8249b156401638dd84b
parent4608d0bb7e47c52b8f6e9be259bfb1716fda9fd6 (diff)
downloadmeta-mingw-92258028e1b5664a9f832541d5c4f6de0bd05e07.tar.gz
mingw32: Fix tool overrideyocto-4.2.3mickledore-4.2.34.3_M2
6badeda ("mingw32: Add WINDRES export for SDK") attempted to fix the GCC 13 Canadian cross compile for MinGW host, but used the broad sdkming32 override, which made it apply to all target recipes. This caused build errors in other recipes. Tighten the scope of the variables to only apply when doing a Canadian cross compile. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-rw-r--r--conf/machine-sdk/include/mingw32-common.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/conf/machine-sdk/include/mingw32-common.inc b/conf/machine-sdk/include/mingw32-common.inc
index 1007bd4..909fc06 100644
--- a/conf/machine-sdk/include/mingw32-common.inc
+++ b/conf/machine-sdk/include/mingw32-common.inc
@@ -38,9 +38,9 @@ TESTSDKEXT_CLASS_NAME = ""
38WINDMC:mingw32 = "${HOST_PREFIX}windmc" 38WINDMC:mingw32 = "${HOST_PREFIX}windmc"
39WINDRES:mingw32 = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" 39WINDRES:mingw32 = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
40RC:mingw32 = "${WINDRES}" 40RC:mingw32 = "${WINDRES}"
41WINDMC:sdkmingw32 = "${HOST_PREFIX}windmc" 41WINDMC:class-cross-canadian = "${HOST_PREFIX}windmc"
42WINDRES:sdkmingw32 = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}" 42WINDRES:class-cross-canadian = "${HOST_PREFIX}windres --include-dir=${STAGING_INCDIR}"
43RC:sdkmingw32 = "${WINDRES}" 43RC:class-cross-canadian = "${WINDRES}"
44 44
45export WINDMC 45export WINDMC
46export WINDRES 46export WINDRES