From 9d8b5d1ce04cf53b4c119f1b43d784874b11881b Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 22 Mar 2017 15:45:59 +0000
Subject: [PATCH] Makefile: Move CUSTOMOPT to follow COMPILERFLAGS and
 LINKERFLAGS, so that it can overwrite more.

git-svn-id: https://svn.eduke32.com/eduke32@6086 1a8010ca-5511-0410-912e-c29ae57300e0
---
 Common.mak | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/Common.mak b/Common.mak
index 6dba8a208..bf670e3b3 100644
--- a/Common.mak
+++ b/Common.mak
@@ -1019,19 +1019,16 @@ ifneq (,$(VC_REV)$(VC_REV_CUSTOM))
     REVFLAG += -DREV="\"r$(VC_REV)$(VC_REV_CUSTOM)\""
 endif
 
-COMPILER_C=$(CC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS)
-COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS)
-COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS)
-COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS)
-LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) $(COMMONFLAGS) $(LINKERFLAGS)
+COMPILER_C=$(CC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
+COMPILER_CXX=$(CXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
+COMPILER_OBJC=$(COBJC) $(CONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(CONLYWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
+COMPILER_OBJCXX=$(COBJCXX) $(CXXONLYFLAGS) $(COMMONFLAGS) $(CWARNS) $(COMPILERFLAGS) $(CUSTOMOPT)
+LINKER=$(L_CXX) $(CXXONLYFLAGS) $(L_CXXONLYFLAGS) $(COMMONFLAGS) $(LINKERFLAGS) $(CUSTOMOPT)
 ifneq ($(CPLUSPLUS),0)
     COMPILER_C=$(COMPILER_CXX)
     COMPILER_OBJC=$(COMPILER_OBJCXX)
 endif
 
-ifneq (,$(CUSTOMOPT))
-    COMMONFLAGS+= $(CUSTOMOPT)
-endif
 ifneq (,$(CFLAGS))
     COMMONFLAGS+= $(CFLAGS)
 endif