- Timestamp:
- Jan 22, 2023 6:23:03 PM (21 months ago)
- File:
-
- 1 edited
-
trunk/Config.kmk (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Config.kmk
r98212 r98213 8628 8628 # This mostly about zapping the VBoxR3Exe linker flags and libraries. 8629 8629 # 8630 TEMPLATE_VBOXGUESTR3XF86MOD = VBox XFree86 Guest Module 8631 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS = VBoxGuestR3ExeBase 8632 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 8633 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 8630 TEMPLATE_VBOXGUESTR3XF86MOD := VBox XFree86 Guest Module 8631 TEMPLATE_VBOXGUESTR3XF86MOD_EXTENDS := VBoxGuestR3ExeBase 8632 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF := .o 8633 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS 8634 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS)) \ 8635 -fno-pie -fno-merge-constants -std=c99 -ffreestanding 8636 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS)) \ 8637 -fno-pie -fno-merge-constants -ffreestanding 8638 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h 8639 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h 8634 8640 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 8635 8641 # The GNU_HASH ELF tag is not supported by older glibc dynamic linkers. 8636 8642 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.linux = $(subst -Wl$(COMMA),,$(VBOX_LD_hash_style_sysv)) 8637 8643 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 8638 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS = -r8644 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS := -r 8639 8645 if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) # the gnu ld guys. 8640 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release = -S 8641 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386 8642 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64 8643 endif 8644 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CFLAGS)) \ 8645 -fno-pie -fno-merge-constants -std=c99 -ffreestanding 8646 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3ExeBase_CXXFLAGS)) \ 8647 -fno-pie -fno-merge-constants -ffreestanding 8648 TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h 8649 TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS.linux = $(VBOX_GCC_fno-stack-protector) # Remove symvers.h 8650 TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o 8651 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \ 8652 $(VBOX_LIB_VBGL_R3_XFREE86) 8653 TEMPLATE_VBOXGUESTR3XF86MOD_DEFS = $(TEMPLATE_VBoxGuestR3ExeBase_DEFS) VBOX_GUESTR3XF86MOD RTMEM_NO_WRAP_TO_EF_APIS 8646 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.release := -S 8647 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 := -m elf_i386 8648 TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 := -m elf_x86_64 8649 endif 8650 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = $(VBOX_LIB_VBGL_R3_XFREE86) 8651 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 8652 TEMPLATE_VBOXGUESTR3XF86MOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 8654 8653 8655 8654 … … 8657 8656 # Template for XFree86 guest libraries. 8658 8657 # 8659 TEMPLATE_VBOXGUESTR3XF86LIB = VBox XFree86 Guest Library8660 TEMPLATE_VBOXGUESTR3XF86LIB_EXTENDS = VBOXGUESTR3XF86MOD8661 TEMPLATE_VBOXGUESTR3XF86LIB_INST = $(INST_ADDITIONS_LIB)8658 TEMPLATE_VBOXGUESTR3XF86LIB := VBox XFree86 Guest Library 8659 TEMPLATE_VBOXGUESTR3XF86LIB_EXTENDS := VBOXGUESTR3XF86MOD 8660 TEMPLATE_VBOXGUESTR3XF86LIB_INST = $(INST_ADDITIONS_LIB) 8662 8661 8663 8662 … … 8666 8665 # This mostly about zapping unnecessary LIBS from VBoxGuestR3DllNonPedantic and adding some flags. 8667 8666 # 8668 TEMPLATE_VBOXGUESTR3XORGMOD = VBox X.org Guest Module 8669 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBoxGuestR3DllNonPedantic 8670 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 8671 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 8672 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99 8667 TEMPLATE_VBOXGUESTR3XORGMOD := VBox X.org Guest Module 8668 TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS := VBoxGuestR3DllNonPedantic 8669 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS 8670 ifeq ($(KBUILD_TARGET_ARCH),amd64) 8671 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64 8672 endif 8673 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CFLAGS)) -std=c99 8673 8674 TEMPLATE_VBOXGUESTR3XORGMOD_CXXFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_CXXFLAGS)) 8674 8675 if1of ($(KBUILD_TARGET), linux) 8675 8676 TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS += -Wno-conversion -Wno-unused-parameter 8676 8677 endif 8677 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBoxGuestR3DllNonPedantic_DEFS) VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS 8678 ifeq ($(KBUILD_TARGET_ARCH),amd64) 8679 TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64 8680 endif 8681 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS)) 8682 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS = \ 8683 $(VBOX_LIB_VBGL_R3_XORG) 8684 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.freebsd += \ 8685 iconv 8678 TEMPLATE_VBOXGUESTR3XORGMOD_LDFLAGS = $(filter-out $(VBOX_GCC_SANITIZER_FLAGS) $(VBOX_GCC_SANITIZER_LDFLAGS),$(TEMPLATE_VBoxGuestR3DllNonPedantic_LDFLAGS)) 8679 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS = $(VBOX_LIB_VBGL_R3_XORG) 8680 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE) 8681 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE) 8682 TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.freebsd += iconv 8686 8683 8687 8684 … … 8689 8686 # Template for X.Org guest libraries. 8690 8687 # 8691 TEMPLATE_VBOXGUESTR3XORGLIB = VBox X.Org Guest Library8692 TEMPLATE_VBOXGUESTR3XORGLIB_EXTENDS = VBOXGUESTR3XORGMOD8693 TEMPLATE_VBOXGUESTR3XORGLIB_INST = $(INST_ADDITIONS_LIB)8688 TEMPLATE_VBOXGUESTR3XORGLIB := VBox X.Org Guest Library 8689 TEMPLATE_VBOXGUESTR3XORGLIB_EXTENDS := VBOXGUESTR3XORGMOD 8690 TEMPLATE_VBOXGUESTR3XORGLIB_INST = $(INST_ADDITIONS_LIB) 8694 8691 8695 8692
Note:
See TracChangeset
for help on using the changeset viewer.

