VirtualBox

Changeset 107126 in vbox


Ignore:
Timestamp:
Nov 22, 2024 4:05:47 PM (8 weeks ago)
Author:
vboxsync
Message:

/Config.kmk: scm fixes. jiraref:VBP-1439

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Config.kmk

    r107116 r107126  
    573573endif
    574574# Makes x86 emulation on ARM hosts available in the GUI.
    575 if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), )
     575if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), empty-set)
    576576 VBOX_WITH_X86_ON_ARM_ENABLED = 1
    577577endif
     
    64056405  TEMPLATE_VBoxR3Exe_LDFLAGS.asan       = -InferAsanLibs:No
    64066406 endif
    6407  
     6407
    64086408 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC140"
    64096409  TEMPLATE_VBoxR3Exe_LATE_LIBS.x86     = \
     
    74597459 if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142"
    74607460  TEMPLATE_VBoxMainExe_LDFLAGS.asan      = -InferAsanLibs:No
    7461  endif 
     7461 endif
    74627462 TEMPLATE_VBoxMainExe_LATE_LIBS          = \
    74637463        $(LIB_RUNTIME)
     
    81848184  if "$(VBOX_VCC_TOOL_STEM)" >= "VCC142"
    81858185   TEMPLATE_VBoxQtGuiExe_LDFLAGS.asan = -InferAsanLibs:No
    8186   endif 
     8186  endif
    81878187
    81888188  TEMPLATE_VBoxQtGuiExe_SDKS += $(VBOX_WINPSDK)
     
    84048404 TEMPLATE_VBoxNLS_LDFLAGS.win = $(TEMPLATE_VBoxR3Static_LDFLAGS.win) -Entry:main
    84058405 TEMPLATE_VBoxNLS_SOURCES = \
    8406       $(PATH_ROOT)/src/VBox/Main/nls/dummy.c
     8406        $(PATH_ROOT)/src/VBox/Main/nls/dummy.c
    84078407 TEMPLATE_VBoxNLS_SDKS.$(KBUILD_TARGET_ARCH) = $(filter-out VBoxOpenSslStatic,$(TEMPLATE_VBoxR3Static_SDKS.$(KBUILD_TARGET_ARCH)))
    84088408 ifdef VBOX_WITH_NOCRT_STATIC
     
    84148414                $(VBOX_LIB_RUNTIME_STATIC) \
    84158415                $(PATH_STAGE_LIB)/VBox-libxml2-static$(VBOX_SUFF_LIB), \
    8416                 $(TEMPLATE_VBoxR3Static_LATE_LIBS.$(KBUILD_TARGET_ARCH)))
     8416                $(TEMPLATE_VBoxR3Static_LATE_LIBS.$(KBUILD_TARGET_ARCH)))
    84178417 endif
    84188418endif # !VBOX_WITH_NLS
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