Skip to content

Commit 6e78e27

Browse files
committed
patch 8.0.0203: order of complication flags is sometimes wrong
Problem: Order of complication flags is sometimes wrong. Solution: Put interface-specific flags before ALL_CFLAGS. (idea by Yousong Zhou, closes #1100)
1 parent 4007ed4 commit 6e78e27

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

src/Makefile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1877,7 +1877,9 @@ myself:
18771877

18781878

18791879
# The normal command to compile a .c file to its .o file.
1880-
CCC = $(CC) -c -I$(srcdir) $(ALL_CFLAGS)
1880+
# Without or with ALL_CFLAGS.
1881+
CCC_NF = $(CC) -c -I$(srcdir)
1882+
CCC = $(CCC_NF) $(ALL_CFLAGS)
18811883

18821884

18831885
# Link the target for normal use or debugging.
@@ -2976,7 +2978,7 @@ objects/gui_gtk_f.o: gui_gtk_f.c
29762978
$(CCC) -o $@ gui_gtk_f.c
29772979

29782980
objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
2979-
$(CCC) $(PERL_CFLAGS) -o $@ auto/gui_gtk_gresources.c
2981+
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ auto/gui_gtk_gresources.c
29802982

29812983
objects/gui_gtk_x11.o: gui_gtk_x11.c
29822984
$(CCC) -o $@ gui_gtk_x11.c
@@ -3009,7 +3011,7 @@ objects/if_xcmdsrv.o: if_xcmdsrv.c
30093011
$(CCC) -o $@ if_xcmdsrv.c
30103012

30113013
objects/if_lua.o: if_lua.c
3012-
$(CCC) $(LUA_CFLAGS) -o $@ if_lua.c
3014+
$(CCC_NF) $(LUA_CFLAGS) $(ALL_CFLAGS) -o $@ if_lua.c
30133015

30143016
objects/if_mzsch.o: if_mzsch.c $(MZSCHEME_EXTRA)
30153017
$(CCC) -o $@ $(MZSCHEME_CFLAGS_EXTRA) if_mzsch.c
@@ -3018,27 +3020,28 @@ mzscheme_base.c:
30183020
$(MZSCHEME_MZC) --c-mods mzscheme_base.c ++lib scheme/base
30193021

30203022
objects/if_perl.o: auto/if_perl.c
3021-
$(CCC) $(PERL_CFLAGS) -o $@ auto/if_perl.c
3023+
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ auto/if_perl.c
30223024

30233025
objects/if_perlsfio.o: if_perlsfio.c
3024-
$(CCC) $(PERL_CFLAGS) -o $@ if_perlsfio.c
3026+
$(CCC_NF) $(PERL_CFLAGS) $(ALL_CFLAGS) -o $@ if_perlsfio.c
30253027

30263028
objects/py_getpath.o: $(PYTHON_CONFDIR)/getpath.c
3027-
$(CCC) $(PYTHON_CFLAGS) -o $@ $(PYTHON_CONFDIR)/getpath.c \
3029+
$(CCC_NF) $(PYTHON_CFLAGS) $(ALL_CFLAGS) -o $@ \
3030+
$(PYTHON_CONFDIR)/getpath.c \
30283031
-I$(PYTHON_CONFDIR) -DHAVE_CONFIG_H -DNO_MAIN \
30293032
$(PYTHON_GETPATH_CFLAGS)
30303033

30313034
objects/if_python.o: if_python.c if_py_both.h
3032-
$(CCC) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) -o $@ if_python.c
3035+
$(CCC_NF) $(PYTHON_CFLAGS) $(PYTHON_CFLAGS_EXTRA) $(ALL_CFLAGS) -o $@ if_python.c
30333036

30343037
objects/if_python3.o: if_python3.c if_py_both.h
3035-
$(CCC) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) -o $@ if_python3.c
3038+
$(CCC_NF) $(PYTHON3_CFLAGS) $(PYTHON3_CFLAGS_EXTRA) $(ALL_CFLAGS) -o $@ if_python3.c
30363039

30373040
objects/if_ruby.o: if_ruby.c
3038-
$(CCC) $(RUBY_CFLAGS) -o $@ if_ruby.c
3041+
$(CCC_NF) $(RUBY_CFLAGS) $(ALL_CFLAGS) -o $@ if_ruby.c
30393042

30403043
objects/if_tcl.o: if_tcl.c
3041-
$(CCC) $(TCL_CFLAGS) -o $@ if_tcl.c
3044+
$(CCC_NF) $(TCL_CFLAGS) $(ALL_CFLAGS) -o $@ if_tcl.c
30423045

30433046
objects/integration.o: integration.c
30443047
$(CCC) -o $@ integration.c
@@ -3095,7 +3098,7 @@ objects/ops.o: ops.c
30953098
$(CCC) -o $@ ops.c
30963099

30973100
objects/option.o: option.c
3098-
$(CCC) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) $(TCL_CFLAGS) -o $@ option.c
3101+
$(CCC_NF) $(LUA_CFLAGS) $(PERL_CFLAGS) $(PYTHON_CFLAGS) $(PYTHON3_CFLAGS) $(RUBY_CFLAGS) $(TCL_CFLAGS) $(ALL_CFLAGS) -o $@ option.c
30993102

31003103
objects/os_beos.o: os_beos.c
31013104
$(CCC) -o $@ os_beos.c

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
203,
767769
/**/
768770
202,
769771
/**/

0 commit comments

Comments
 (0)