1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
Author: Andreas Tille <tille@debian.org>
Last-Update: 2025-11-28
Bug-Debian: https://bugs.debian.org/1119351
Description: Make sure build flags will be used
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ XFREE86JAPANESEDOCDIR = $(XFREE86DOCDIR)
.SUFFIXES: .cxx
CXX = c++
- CXXDEBUGFLAGS = -O2 -fno-strength-reduce -m486
+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce
CXXEXTRA_DEFINES =
CXXEXTRA_INCLUDES =
CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
@@ -177,7 +177,7 @@ CXXEXTRA_INCLUDES =
STD_INCLUDES =
STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DX_LOCALE
- EXTRA_LOAD_FLAGS = -Wl,-rpath,$(SHLIBDIR)
+ EXTRA_LOAD_FLAGS =
EXTRA_LDOPTIONS =
EXTRA_LIBRARIES =
TAGS = ctags
@@ -207,16 +207,16 @@ CXXEXTRA_INCLUDES =
TOP_INCLUDES = -I$(INCROOT)
- CDEBUGFLAGS = -O2 -fno-strength-reduce -m486
+ CDEBUGFLAGS = -O2 -fno-strength-reduce
CCOPTIONS =
ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES)
ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES)
- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
+ CFLAGS += $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
LDPRELIB = -L$(USRLIBDIR)
LDPOSTLIB =
- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB) $(LDFLAGS)
CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIB)
LDLIBS = $(LDPOSTLIB) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
@@ -569,7 +569,7 @@ clean::
.c.i:
$(RM) $@
- $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@
+ $(CC) $(CPPFLAGS) -E $(CFLAGS) $(_NOOP_) $*.c > $@
emptyrule::
|
