*** old/make/bsd/makefiles/gcc.make	Wed Jun 18 18:58:52 2014
--- new/make/bsd/makefiles/gcc.make	Wed Jun 18 18:58:52 2014

*** 278,288 ****
--- 278,290 ----
    CFLAGS_WARN/os_bsd.o = $(CFLAGS_WARN/DEFAULT) -Wno-deprecated-declarations
  endif
  
  # optimization control flags (Used by fastdebug and release variants)
  OPT_CFLAGS/NOOPT=-O0
! ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
! ifeq ($(USE_CLANG), true)
+   OPT_CFLAGS/DEBUG=-O0
+ else ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
    # Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
    OPT_CFLAGS/DEBUG=-Og
  else
    # Allow no optimizations.
   OPT_CFLAGS/DEBUG=-O0

*** 441,451 ****
--- 443,455 ----
    # too big object files and speed the build up a little bit
    # (see http://llvm.org/bugs/show_bug.cgi?id=7554)
    CFLAGS += -flimit-debug-info
  endif
  
! ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
! ifeq ($(USE_CLANG), true)
+   DEBUG_CFLAGS=-O0
+ else ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 8 \) \))" "1"
    # Allow basic optimizations which don't distrupt debugging. (Principally dead code elimination)
    DEBUG_CFLAGS=-Og
  else
    # Allow no optimizations.
    DEBUG_CFLAGS=-O0