diff --git a/Makefile.system b/Makefile.system
index 16791bcc2..09a648e4a 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -1124,8 +1124,12 @@ endif
 endif
 
 ifdef NO_AFFINITY
+ifeq ($(NO_AFFINITY), 0)
+override undefine NO_AFFINITY
+else
 CCOMMON_OPT	+= -DNO_AFFINITY
 endif
+endif
 
 ifdef FUNCTION_PROFILE
 CCOMMON_OPT	+= -DFUNCTION_PROFILE