Changeset 3488 in kBuild

Timestamp:

Sep 22, 2020 9:47:02 AM (4 years ago)

Author:

bird

Message:

darwin-common.kmk: Corrections to DARWINCMN_MACOSX_SDKS_DIRS.

File:

• trunk/kBuild/darwin-common.kmk (modified) (1 diff)

trunk/kBuild/darwin-common.kmk

@@ -75 +75 @@
 DARWINCMN_MACOSX_SDKS_DIRS = $(DARWINCMN_MACOSX_SDKS_DIRS_PREFERRED) \
         $(if-expr defined(DARWINCMN_MACOSX_SDKS_DIRS_IGNORE_DEVTOOLS),, \
-                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TGT)/SDKs)) \
-                $(if-expr "$(KBUILD_DEVTOOLS_TGT_ALT)" != "", \
-                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TGT_ALT)/SDKs)) ,)\
-                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/CommandLineTools/v*/SDKs)) \
-                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/xcode/v*/*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs)) \
-                $(if-expr "$(KBUILD_DEVTOOLS_HST_ALT)" != "", \
-                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/CommandLineTools/v*)) \
-                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/xcode/v*/*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs)) ,) \
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG_NOARCH)/SDKs)) \
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG)/SDKs)) \
+                $(if-expr "$(KBUILD_DEVTOOLS_TRG_ALT)" != "", \
+                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_TRG_ALT)/SDKs)) ,) \
+                $(if-expr "$(KBUILD_DEVTOOLS_TRG_NOARCH)" != "$(KBUILD_DEVTOOLS_HST_NOARCH)", \
+                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_NOARCH)/SDKs)),) \
+                $(if-expr "$(KBUILD_DEVTOOLS_HST)" != "$(KBUILD_DEVTOOLS_TRG)", \
+                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/SDKs)) \
+                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/CommandLineTools/v*/SDKs)) \
+                        $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST)/xcode/v*/*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs)) \
+                        $(if-expr "$(KBUILD_DEVTOOLS_HST_ALT)" != "", \
+                                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/CommandLineTools/v*)) \
+                                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/xcode/v*/*.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs)) ,) \
+                ) \
         ) \
         /Library/Developer/CommandLineTools/SDKs \