diff options
| author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2013-12-16 18:28:51 +0000 |
|---|---|---|
| committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2013-12-16 18:28:51 +0000 |
| commit | fb95254179497a9eb3399fe5d11ed25f7b49d7da (patch) | |
| tree | 160d0e25c2a03456e7b46871b5b4a9fba2bdabac /Config.kmk | |
| parent | 9a50f74a719e60121d312fa4dfa726421c36ccc6 (diff) | |
| download | VirtualBox-svn-fb95254179497a9eb3399fe5d11ed25f7b49d7da.tar.gz | |
Config.kmk: don't depend on static system libs on Linux
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@49941 cfe28804-0f27-0410-a406-dd0f0b0b656f
Diffstat (limited to 'Config.kmk')
| -rw-r--r-- | Config.kmk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Config.kmk b/Config.kmk index 846e9a76f47..c6fa5b8c22d 100644 --- a/Config.kmk +++ b/Config.kmk @@ -3786,8 +3786,8 @@ ifeq ($(KBUILD_TARGET),win) $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcmt$(VBOX_VCC_CRT_TYPE).lib \ $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/libcpmt$(VBOX_VCC_CRT_TYPE).lib \ $(PATH_TOOL_$(TEMPLATE_VBOXR3STATIC_TOOL.win.amd64)_LIB)/oldnames.lib -else ifn1of ($(KBUILD_TARGET), darwin solaris) - # The gcc guys sans darwin and solaris. +else ifn1of ($(KBUILD_TARGET), darwin linux solaris) + # The gcc guys sans darwin, linux and solaris (don't depend on statically compiled system libs there) TEMPLATE_VBOXR3STATIC_CFLAGS = $(TEMPLATE_VBOXR3EXE_CFLAGS) -static TEMPLATE_VBOXR3STATIC_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -static TEMPLATE_VBOXR3STATIC_OBJCFLAGS = $(TEMPLATE_VBOXR3EXE_OBJCFLAGS) -static @@ -3795,6 +3795,9 @@ else ifn1of ($(KBUILD_TARGET), darwin solaris) TEMPLATE_VBOXR3STATIC_LDFLAGS = $(TEMPLATE_VBOXR3EXE_LDFLAGS) -static else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXR3STATIC_LIBS = $(TEMPLATE_VBOXR3EXE_LIBS) nsl + TEMPLATE_VBOXR3STATIC_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)',$(TEMPLATE_VBOXR3EXE_LDFLAGS)) +else + TEMPLATE_VBOXR3STATIC_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)',$(TEMPLATE_VBOXR3EXE_LDFLAGS)) endif # |