From 2c001246a0d7c42ecee24642a814c4f6b4fe7451 Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Wed, 7 May 2014 19:19:18 +0200 Subject: [PATCH] build: when using gcc4 build kernel with c++11 --- build/jam/ArchitectureRules | 4 ++++ src/system/kernel/arch/x86/Jamfile | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index 506055e260..0c3200f343 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -403,6 +403,10 @@ rule KernelArchitectureSetup architecture HAIKU_BOOT_C++FLAGS = $(HAIKU_C++FLAGS_$(architecture)) $(g++BaseFlags) ; HAIKU_BOOT_LINKFLAGS = ; + if $(gccVersion[1]) >= 4 { + HAIKU_KERNEL_C++FLAGS += -std=gnu++11 ; + } + HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ; HAIKU_KERNEL_PIC_LINKFLAGS = ; HAIKU_KERNEL_ADDON_LINKFLAGS = ; diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile index ee6d93b525..3941e18b5c 100644 --- a/src/system/kernel/arch/x86/Jamfile +++ b/src/system/kernel/arch/x86/Jamfile @@ -17,8 +17,6 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) timers ] ; local archSpecificSources ; if $(TARGET_ARCH) = x86_64 { - SubDirC++Flags -std=gnu++11 ; - SEARCH_SOURCE += [ FDirName $(SUBDIR) 64 ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) paging 64bit ] ;