Skip to content

Commit 825ccf4

Browse files
committed
patch 8.0.1847: some build options don't have an example
Problem: Some build options don't have an example. Solution: Add a couple more examples and compiler flags.
1 parent d4a8c98 commit 825ccf4

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,8 +446,10 @@ CClink = $(CC)
446446
# However, this may still cause problems, such as "import termios" failing.
447447
# Build two separate versions of Vim in that case.
448448
#CONF_OPT_PYTHON = --enable-pythoninterp
449+
#CONF_OPT_PYTHON = --enable-pythoninterp --with-python-command=python2.7
449450
#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
450451
#CONF_OPT_PYTHON3 = --enable-python3interp
452+
#CONF_OPT_PYTHON3 = --enable-python3interp --with-python3-command=python3.6
451453
#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
452454

453455
# RUBY
@@ -611,8 +613,8 @@ CClink = $(CC)
611613
#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
612614
# Add -Wpedantic to find // comments and other C99 constructs.
613615
# Better disable Perl and Python to avoid a lot of warnings.
614-
#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
615-
#CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
616+
#CFLAGS = -g -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
617+
#CFLAGS = -g -O2 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wunreachable-code -Wunused-result -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
616618
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
617619
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
618620

src/version.c

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

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1847,
764766
/**/
765767
1846,
766768
/**/

0 commit comments

Comments
 (0)