Index: Makefile
===================================================================
--- Makefile	(revision 5104)
+++ Makefile	(working copy)
@@ -229,11 +229,14 @@
 fi; rm -rf "$$TMP")
 
 cc-option= $(call try-run,\
-$(CC) $(1) -S -xc /dev/null -o "$$TMP", $(1), $(2))
+$(CC) $(1) -nostdlib -xc /dev/null -o "$$TMP", $(1), $(2))
 
+# official work around for "," in lists
+comma:=,
 STACKPROTECT += $(call cc-option, -fno-stack-protector,)
+BUILDID_FLAG += $(call cc-option, -Wl$(comma)--build-id=none,)
 
-CFLAGS = $(STACKPROTECT) $(INCLUDES) -Os -nostdinc
+CFLAGS = $(STACKPROTECT) $(BUILDID_FLAG) $(INCLUDES) -Os -nostdinc
 CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes
 CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs 
 CFLAGS += -Wstrict-aliasing -Wshadow 
