Skip to content

Commit dd24574

Browse files
authored
Merge pull request #162 from jayrm/strip-all
makefile: use '-d ENABLE_STRIPALL' by default on dos/win32 builds fbc makefile logic changed as follows: - 'ENABLE_STRIPALL=1' passes '-d ENABLE_STRIPALL' via FBCFLAGS on all targets - 'ENABLE_STRIPALL=0' disables passing '-d ENABLE_STRIPALL' via FBCFLAGS on all targets - '-d ENABLE_STRIPALL' passed by default for dos/win32 targets when 'ENABLE_STRIPALL=0' not explicitly given
2 parents 13d198e + d0c6d12 commit dd24574

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

changelog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ Version 1.07.0
1010
- github #133: fbc makefile supports bootstrap-minimal target to build a bootstrap fbc with only the minimal features necessary to build another fbc. (William Breathitt Gray)
1111
- github #141: introduced '-strip'/'-nostrip' options to control symbol stripping of output files (William Breathitt Gray)
1212
- github #141: fbc will default to stripping symbols if '-d ENABLE_STRIPALL' is passed in FBCFLAGS (William Breathitt Gray)
13-
- github #141: makefile option 'ENABLE_STRIPALL=1' introduced to pass '-d ENABLE_STRIPALL' via FBCFLAGS by default for dos/win32 targets (William Breathitt Gray)
13+
- github #141: makefile option 'ENABLE_STRIPALL=1' introduced to pass '-d ENABLE_STRIPALL' via FBCFLAGS (William Breathitt Gray)
14+
- makefile: 'ENABLE_STRIPALL=1' passes '-d ENABLE_STRIPALL' via FBCFLAGS on all targets
15+
- makefile: 'ENABLE_STRIPALL=0' disables passing '-d ENABLE_STRIPALL' via FBCFLAGS on all targets
16+
- makefile: '-d ENABLE_STRIPALL' passed by default for dos/win32 targets when 'ENABLE_STRIPALL=0' not explicitly given
1417
- 'TYPE udt EXTENDS Z|WSTRING' allowed to specify that UDT is a kind of Z|WSTRING
1518
- LTRIM/RTRIM/TRIM will accept UDT as Z|WSTRING
1619
- LCASE/UCASE will accept UDT as Z|WSTRING

makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@
8181
# ENABLE_SUFFIX=-0.24 append a string like "-0.24" to fbc/FB dir names,
8282
# and use "-d ENABLE_SUFFIX=$(ENABLE_SUFFIX)" (non-standalone only)
8383
# ENABLE_LIB64=1 use prefix/lib64/ instead of prefix/lib/ for 64bit libs (non-standalone only)
84-
# ENABLE_STRIPALL=1 use "-d ENABLE_STRIPALL" with select targets
84+
# ENABLE_STRIPALL=1 use "-d ENABLE_STRIPALL" with all targets
85+
# ENABLE_STRIPALL=0 disable "-d ENABLE_STRIPALL" with all targets
8586
# FBPACKAGE bindist: The package/archive file name without path or extension
8687
# FBPACKSUFFIX bindist: Allows adding a custom suffix to the normal package name (and the toplevel dir in the archive)
8788
# FBMANIFEST bindist: The manifest file name without path or extension
@@ -432,6 +433,11 @@ ifdef ENABLE_LIB64
432433
ALLFBCFLAGS += -d ENABLE_LIB64
433434
endif
434435
ifdef ENABLE_STRIPALL
436+
ifneq ($(ENABLE_STRIPALL),0)
437+
ALLFBCFLAGS += -d ENABLE_STRIPALL
438+
endif
439+
else
440+
# by default dos and windows use --strip-all
435441
ifneq ($(filter dos win32,$(TARGET_OS)),)
436442
ALLFBCFLAGS += -d ENABLE_STRIPALL
437443
endif

0 commit comments

Comments
 (0)