Changeset 76668 in vbox for trunk/src

Timestamp:

Jan 7, 2019 7:26:37 AM (6 years ago)

Author:

vboxsync

Message:

Main,FE/Qt: Only use precompiled headers for gcc 5.x and higher (for now).

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Main/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -2287 +2287 @@
 
  else if $(KBUILD_KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
-  VBoxGlobal_USES      += gccprecomp
-  VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
-  #VBoxGlobal_CXXFLAGS.linux += -H
-
-  VirtualBox_USES      += gccprecomp
-  VirtualBox_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
-  #VirtualBox_CXXFLAGS.linux += -H
-
-  VirtualBoxVM_USES    += gccprecomp
-  VirtualBoxVM_PCH_HDR := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
-  #VirtualBoxVM_CXXFLAGS.linux += -H
-
-  # GCC precompiled headers seems to work more efficiently when #pragma once is involved.
-  # So, we've cooked our own camel cased qt wrapper headers with #pragma once inside.
-  VBOX_GUI_INC_DIRS <= precomptricks
+  if $(VBOX_GCC_VERSION_CXX) >= 50000 # GCC 4.x runs into trouble compiling the header.
+   VBoxGlobal_USES      += gccprecomp
+   VBoxGlobal_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
+   #VBoxGlobal_CXXFLAGS.linux += -H
+
+   VirtualBox_USES      += gccprecomp
+   VirtualBox_PCH_HDR   := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
+   #VirtualBox_CXXFLAGS.linux += -H
+
+   VirtualBoxVM_USES    += gccprecomp
+   VirtualBoxVM_PCH_HDR := $(PATH_SUB_CURRENT)/src/precomp_gcc.h
+   #VirtualBoxVM_CXXFLAGS.linux += -H
+
+   # GCC precompiled headers seems to work more efficiently when #pragma once is involved.
+   # So, we've cooked our own camel cased qt wrapper headers with #pragma once inside.
+   VBOX_GUI_INC_DIRS <= precomptricks
+  endif
  endif
 endif

trunk/src/VBox/Main/Makefile.kmk

@@ -279 +279 @@
   VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/win/VBoxAPIWrap-precomp_vcc.h
  else if $(KBUILD_KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
-  VBoxAPIWrap_USES           = gccprecomp
-  VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/xpcom/VBoxAPIWrap-precomp_gcc.h
+  if $(VBOX_GCC_VERSION_CXX) >= 50000 # GCC 4.x runs into trouble compiling the header.
+VBoxAPIWrap_USES           = gccprecomp
+VBoxAPIWrap_PCH_HDR       := $(PATH_SUB_CURRENT)/src-all/xpcom/VBoxAPIWrap-precomp_gcc.h
+  endif
  endif
  VBoxAPIWrap_SOURCES         = \
@@ -412 +414 @@
  VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/win/precomp_vcc.h
 else if $(KBUILD_KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
- VBoxSVC_USES    += gccprecomp
- VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/xpcom/precomp_gcc.h
+ if $(VBOX_GCC_VERSION_CXX) >= 50000 # GCC 4.x runs into trouble compiling the header.
+VBoxSVC_USES    += gccprecomp
+VBoxSVC_PCH_HDR := $(PATH_SUB_CURRENT)/src-server/xpcom/precomp_gcc.h
+ endif
 endif
 ## r=bird: If you really think you might need VBOX_WITH_RECORDING and VBOX_WITH_AUDIO_RECORDING both here and for
@@ -812 +816 @@
  VBoxC_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/win/precomp_vcc.h
 else if $(KBUILD_KMK_REVISION) >= 3256 && "$(KBUILD_TARGET)" != "darwin" && !defined(VBOX_WITHOUT_PRECOMPILED_HEADERS)
- VBoxC_USES    += gccprecomp
- VBoxC_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/xpcom/precomp_gcc.h
+ if $(VBOX_GCC_VERSION_CXX) >= 50000 # GCC 4.x runs into trouble compiling the header.
+VBoxC_USES    += gccprecomp
+VBoxC_PCH_HDR := $(PATH_SUB_CURRENT)/src-client/xpcom/precomp_gcc.h
+ endif
 endif
 VBoxC_DEFS = \