From 67cc5911fa0e8cd2ed6d374c1b740a52d9787bf5 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 26 Apr 2015 00:58:08 +0000 Subject: [PATCH] Ensure that Objective-C compiler invocations include the C-only options that we specify, especially -std=gnu99. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5168 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/Makefile.common | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common index 42929c1cd..f85dd75f2 100644 --- a/polymer/eduke32/Makefile.common +++ b/polymer/eduke32/Makefile.common @@ -36,7 +36,7 @@ ifeq ($(AS),as) override AS=nasm endif -COMPILER_OBJC=$(CC) +COBJC=$(CC) L_CC=$(CC) L_CXX=$(CXX) @@ -73,7 +73,7 @@ endif ifneq (0,$(CLANG)) override CC=clang -x c override CXX=clang -x c++ - override COMPILER_OBJC=clang -x objective-c + override COBJC=clang -x objective-c override L_CC=clang override L_CXX=clang endif @@ -1060,6 +1060,7 @@ ifneq (,$(VC_REV)$(VC_REV_CUSTOM)) endif COMPILER=$(CC) $(CONLYFLAGS) +COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) LINKER=$(L_CC) ifneq ($(CPLUSPLUS),0) COMPILER=$(CXX) $(CPPONLYFLAGS)