diff --git a/common/utils/Makefile.inc b/common/utils/Makefile.inc
index 0a62f1b2609e15b9f17bf2fc84359bd7bf0955ee..e804f8877254028800d75077fb5cf5b4609e32cf 100644
--- a/common/utils/Makefile.inc
+++ b/common/utils/Makefile.inc
@@ -1,12 +1,15 @@
 export KERNEL_DIR=/lib/modules/$(shell uname -r)/
-CC=gcc-4.8
-CCC=gcc-4.8
+CC=gcc
+CCC=gcc
 linux := $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
 
 #CFLAGS += -std=gnu99 
-CFLAGS += -Wall -g -ggdb -Wstrict-prototypes -fno-strict-aliasing
+CFLAGS += -Wall -g -ggdb -Wstrict-prototypes -fno-strict-aliasing  -rdynamic
 
-#For performance
+# Need to force this option because default kernel module builder is wrong
+CFLAGS += $(call cc-option,-mpreferred-stack-boundary=4)
+
+#For performance, if some option doesn't exist in all gcc versions, use $(call cc-option,MY_OPTION)
 CFLAGS += -O3 -funroll-loops 
 CFLAGS += -Wno-packed-bitfield-compat 
 
@@ -24,7 +27,7 @@ endif
 
 ifeq ($(linux),1)
 CFLAGS += 
-LDFLAGS += -rdynamic
+LDFLAGS += 
 endif
 
 ITTI_DIR = $(COMMON_UTILS_DIR)/itti
diff --git a/openair2/NAS/DRIVER/MESH/Makefile b/openair2/NAS/DRIVER/MESH/Makefile
index f79cd212fa5b2e5ad8d09b7f4540c02f4e18a05c..bd91c08de27a969f1c77ead68e0a74c2a436b717 100755
--- a/openair2/NAS/DRIVER/MESH/Makefile
+++ b/openair2/NAS/DRIVER/MESH/Makefile
@@ -15,7 +15,7 @@ NAS_UPDIR	:= $(shell /bin/pwd)
 ####################################################
 #      EXTRA COMPILER FLAGS
 ####################################################
-EXTRA_CFLAGS = -fno-common -fno-stack-protector -mpreferred-stack-boundary=4 $(if $(SET_X64),-DARCH_64,) $(if $(SET_X64),-mcmodel=kernel,) $(if $(SET_X64),-m64,) 
+#EXTRA_CFLAGS = -fno-common -fno-stack-protector -mpreferred-stack-boundary=4 $(if $(SET_X64),-DARCH_64,) $(if $(SET_X64),-mcmodel=kernel,) $(if $(SET_X64),-m64,) 
 EXTRA_CFLAGS += -I$(OPENAIR2_DIR)
 ifdef NAS_NETLINK
 EXTRA_CFLAGS += -DNAS_NETLINK
@@ -31,6 +31,9 @@ ifdef ADDRESS_FIX
 EXTRA_CFLAGS += -DNAS_ADDRESS_FIX
 endif
 
+ccflags-y := $(CFLAGS) $(EXTRA_CFLAGS)
+CFLAGS=
+
 ####################################################
 #      LOADABLE MODULE GOALS
 ####################################################