Fossil SCM

Checkin [15e1dcd058b5b3e1] had no useful effect: we need to set this flag at the "make" level, not as a C preprocessor flag. Not backing it out because the change is harmless as well as useless.

wyoung 2018-10-03 22:23 trunk
Commit f08a09ca0dcd7ce27002caa25b4db7261613862f6a350268bbf582f4c99bf48e
1 file changed +7 -6
--- Makefile.classic
+++ Makefile.classic
@@ -46,22 +46,23 @@
4646
TCC += -DFOSSIL_ENABLE_SSL
4747
4848
# To enable legacy mv/rm support
4949
TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
5050
51
-# We don't attempt to use libedit or libreadline in this simplified
52
-# build system (contrast auto.def and Makefile.in) so use the included
53
-# copy of linenoise. MinGW can't make use of this, but linenoise is
54
-# ifdef'd out elsewhere for that platform.
55
-TCC += -DUSE_LINENOISE=1
56
-
5751
#### We sometimes add the -static option here so that we can build a
5852
# static executable that will run in a chroot jail.
5953
#LIB = -static
6054
TCC += -DFOSSIL_DYNAMIC_BUILD=1
6155
6256
TCCFLAGS = $(CFLAGS)
57
+
58
+# We don't attempt to use libedit or libreadline in this simplified
59
+# build system (contrast auto.def and Makefile.in) so use the included
60
+# copy of linenoise. MinGW can't make use of this, but linenoise is
61
+# ifdef'd out elsewhere for that platform. Note that this is a make
62
+# flag handled in src/main.mk, not a C preprocessor flag.
63
+USE_LINENOISE := 1
6364
6465
#### Extra arguments for linking the finished binary. Fossil needs
6566
# to link against the Z-Lib compression library unless the miniz
6667
# library in the source tree is being used. There are no other
6768
# required dependencies.
6869
--- Makefile.classic
+++ Makefile.classic
@@ -46,22 +46,23 @@
46 TCC += -DFOSSIL_ENABLE_SSL
47
48 # To enable legacy mv/rm support
49 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
50
51 # We don't attempt to use libedit or libreadline in this simplified
52 # build system (contrast auto.def and Makefile.in) so use the included
53 # copy of linenoise. MinGW can't make use of this, but linenoise is
54 # ifdef'd out elsewhere for that platform.
55 TCC += -DUSE_LINENOISE=1
56
57 #### We sometimes add the -static option here so that we can build a
58 # static executable that will run in a chroot jail.
59 #LIB = -static
60 TCC += -DFOSSIL_DYNAMIC_BUILD=1
61
62 TCCFLAGS = $(CFLAGS)
 
 
 
 
 
 
 
63
64 #### Extra arguments for linking the finished binary. Fossil needs
65 # to link against the Z-Lib compression library unless the miniz
66 # library in the source tree is being used. There are no other
67 # required dependencies.
68
--- Makefile.classic
+++ Makefile.classic
@@ -46,22 +46,23 @@
46 TCC += -DFOSSIL_ENABLE_SSL
47
48 # To enable legacy mv/rm support
49 TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
50
 
 
 
 
 
 
51 #### We sometimes add the -static option here so that we can build a
52 # static executable that will run in a chroot jail.
53 #LIB = -static
54 TCC += -DFOSSIL_DYNAMIC_BUILD=1
55
56 TCCFLAGS = $(CFLAGS)
57
58 # We don't attempt to use libedit or libreadline in this simplified
59 # build system (contrast auto.def and Makefile.in) so use the included
60 # copy of linenoise. MinGW can't make use of this, but linenoise is
61 # ifdef'd out elsewhere for that platform. Note that this is a make
62 # flag handled in src/main.mk, not a C preprocessor flag.
63 USE_LINENOISE := 1
64
65 #### Extra arguments for linking the finished binary. Fossil needs
66 # to link against the Z-Lib compression library unless the miniz
67 # library in the source tree is being used. There are no other
68 # required dependencies.
69

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button