VirtualBox

Changeset 98143 in vbox for trunk


Ignore:
Timestamp:
Jan 19, 2023 2:49:36 PM (21 months ago)
Author:
vboxsync
Message:

/Config.kmk: Made VBoxR3Static work (hopefully) when targetting non-default architectures (x86). bugref:10348

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r98136 r98143  
    22302230VBOX_LIB_SUPHARDENED            = $(PATH_STAGE_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)
    22312231VBOX_LIB_RUNTIME_STATIC         = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
     2232VBOX_LIB_RUNTIME_STATIC_X86     = $(PATH_STAGE_LIB)/RuntimeR3-x86$(VBOX_SUFF_LIB)
    22322233if "$(KBUILD_TARGET)" == "win" && "$(KBUILD_TYPE)" == "asan"
    22332234VBOX_LIB_RUNTIME_STATIC_NO_ASAN = $(PATH_STAGE_LIB)/RuntimeR3NoAsan$(VBOX_SUFF_LIB)
     
    65736574TEMPLATE_VBoxR3Static_EXTENDS       = VBOXR3STATIC
    65746575TEMPLATE_VBoxR3Static_EXTENDS_BY    = appending
    6575 TEMPLATE_VBoxR3Static_SDKS        += VBOX_OPENSSL
     6576TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH) += VBOX_OPENSSL
    65766577TEMPLATE_VBoxR3Static_SDKS.win     += VBOX_NTDLL
    65776578ifeq ($(KBUILD_TARGET),win)
     
    65866587 TEMPLATE_VBoxR3Static_LDFLAGS.darwin.arm64 += $(TEMPLATE_VBOXR3STATIC_LDFLAGS.darwin.arm64) -framework IOKit
    65876588endif
    6588 TEMPLATE_VBoxR3Static_LIBS        += \
     6589TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
    65896590        $(VBOX_LIB_RUNTIME_STATIC)
     6591ifneq ($(KBUILD_TARGET_ARCH),x86)
     6592TEMPLATE_VBoxR3Static_LIBS.x86     += \
     6593        $(VBOX_LIB_RUNTIME_STATIC_X86)
     6594endif
    65906595ifndef SDK_VBOX_LIBXML2_LIBS
    6591  TEMPLATE_VBoxR3Static_LIBS        += \
     6596 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
    65926597        $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB)
    65936598endif
    6594 if1of ($(KBUILD_TARGET),os2 win)
    6595  TEMPLATE_VBoxR3Static_LIBS        += \
     6599if1of ($(KBUILD_TARGET), os2 win)
     6600 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
    65966601        $(SDK_VBOX_LZF_STATIC_LIBS) \
    65976602        $(SDK_VBOX_ZLIB_STATIC_LIBS)
    65986603else
    6599  TEMPLATE_VBoxR3Static_LIBS        += \
     6604 TEMPLATE_VBoxR3Static_LIBS.$(KBUILD_TARGET_ARCH) += \
    66006605        $(SDK_VBOX_LZF_LIBS) \
    66016606        $(SDK_VBOX_ZLIB_LIBS)
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette