Changeset 41721 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 14, 2012 6:50:22 PM (13 years ago)

Author:

vboxsync

Message:

Additions/solaris: more kernel module dependency handling for cross-builds.

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuest/Makefile.kmk (modified) (1 diff)
• solaris/DRM/Makefile.kmk (modified) (1 diff)
• solaris/DRM/deps.s (added)
• solaris/SharedFolders/Makefile.kmk (modified) (2 diffs)
• solaris/SharedFolders/deps.s (added)

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -53 +53 @@
  VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  ifeq ($(KBUILD_HOST),solaris)
-  VBoxGuest_LDFLAGS.solaris += -N misc/ctf
+  VBoxGuest_LDFLAGS.solaris       += -N misc/ctf
  else
-  VBoxGuest_SOURCES.solaris = solaris/deps.s
-  solaris/deps.s_ASFLAGS    = -f bin -g null
+  VBoxGuest_SOURCES.solaris        = solaris/deps.s
+  VBoxGuest_solaris/deps.s_ASFLAGS = -f bin -g null
  endif
  ifneq ($(KBUILD_TARGET),os2)

trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk

@@ -47 +47 @@
         $(VBOX_LIB_VBGL_R0) \
         $(VBOX_LIB_IPRT_GUEST_R0)
-vboxvideo_LDFLAGS      += -N misc/drm
+ifeq ($(KBUILD_HOST),solaris)
+ vboxvideo_LDFLAGS       += -N misc/drm
+else
+ vboxvideo_SOURCES       += deps.s
+ vboxvideo_deps.s_ASFLAGS = -f bin -g null
+endif
 
 

trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk

@@ -47 +47 @@
 vboxfs_LIBS          = \
         $(VBOX_LIB_VBGL_R0)
-vboxfs_LDFLAGS      += -N drv/vboxguest -N misc/ctf
+ifeq ($(KBUILD_HOST),solaris)
+ vboxfs_LDFLAGS.solaris += -N drv/vboxguest -N misc/ctf
+else
+ vboxfs_SOURCES         += deps.s
+ vboxfs_deps.s_ASFLAGS   = -f bin -g null
+endif
 if $(VBOX_SOLARIS_11_VERSION) >= 175
  && $(VBOX_SOLARIS_11_UPDATE_VERSION) >= 1
@@ -73 +78 @@
         $(VBOX_LIB_VBGL_R0) \
         $(VBOX_LIB_IPRT_GUEST_R0)
-vboxfs_s10_LDFLAGS      += -N drv/vboxguest -N misc/ctf
+ifeq ($(KBUILD_HOST),solaris)
+ vboxfs_s10_LDFLAGS       += -N drv/vboxguest -N misc/ctf
+else
+ vboxfs_s10_SOURCES       += deps.s
+ vboxfs_s10_deps.s_ASFLAGS = -f bin -g null
+endif
 endif # VBOX_OSE