--- src/Makefile.orig	2018-07-16 09:17:06 UTC
+++ src/Makefile
@@ -554,8 +554,10 @@ LIBS:=
 LDFLAGS:=
 INSTALL_SUPPL:=
 
-CFLAGS:=
+#CFLAGS:=
 # Machine architecture.
+# (Ab)using ARCH is very bad idea and can easily break things!
+override undefine ARCH
 ifdef ARCH
   # if does not have leading -march, -mcpu, -mtune, or similar.
   ifeq ($(filter -march% -mcpu% -mtune% -m%, $(strip $(ARCH))),)
@@ -598,7 +600,7 @@ ifeq ($(SMIF), SDL)
       # default is Linux, for all unix SDL
       EXENAME:=doomlegacy
       LDFLAGS+=-L/usr/X11R6/lib
-      LIBS+=-lGL -lGLU -lm
+      LIBS+=-lGL -lGLU -lm -lipx
       # -L/usr/X11R6/lib is needed by Linux 2.4 and others that still have
       # the GLU libraries in an X11 directory.
       # -lm is needed for pow, powf, and other MATH1 functions.
@@ -1001,11 +1003,11 @@ ifdef DEBUG
 else
 # build a normal optimized version
   #CFLAGS+=-O3
-  CFLAGS+=$(OPTLEV) -fomit-frame-pointer
+  #CFLAGS+=$(OPTLEV) -fomit-frame-pointer
 endif
 endif
 
-CFLAGS+=-ffast-math -fno-strict-aliasing
+#CFLAGS+=-ffast-math -fno-strict-aliasing
 # WIN98 linking needs LCFLAGS without -D flags and does not need includes
 LCFLAGS:=$(CFLAGS)
 CFLAGS+=$(OPTS) $(OPTINC)
