Changeset 2566 in kBuild

Timestamp:

Mar 2, 2012 12:58:25 PM (13 years ago)

Author:

bird

Message:

LIBSDL.kmk: fixed solaris/amd64 bustage.

File:

• trunk/kBuild/sdks/LIBSDL.kmk (modified) (1 diff)

trunk/kBuild/sdks/LIBSDL.kmk

@@ -58 +58 @@
 
   ifeq ($(PATH_SDK_LIBSDL),)
-   PATH_SDK_LIBSDL := $(firstword $(wildcard $(addsuffix libSDL.*, $(KBUILD_LIB_SEARCH_PATHS))))
-   ifneq ($(PATH_SDK_LIBSDL),)
-    PATH_SDK_LIBSDL := $(patsubst %/,%,$(dir $(patsubst %/,%,$(dir $(PATH_SDK_LIBSDL)))))
+   PATH_SDK_LIBSDL := $(firstword $(foreach root,$(KBUILD_LIB_SEARCH_ROOTS) \
+        ,$(if $(wildcard $(addsuffix libSDL.*,$(addprefix $(root),$(KBUILD_LIB_SEARCH_SUBS)))),$(root),) ))
+   ifeq ($(PATH_SDK_LIBSDL),/)
+        PATH_SDK_LIBSDL := /.
+   else ifneq ($(PATH_SDK_LIBSDL),)
+        PATH_SDK_LIBSDL := $(patsubst %/,%,$(PATH_SDK_LIBSDL))
    else
     $(warning kBuild: PATH_SDK_LIBSDL couldn't be determined!)