doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Introduce target 'install-strip' in the battle against Mingw-w64 bloat"

Browse source 
This reverts commit 6bfaba6. Target 'install-strip' wasn't a good idea. A
library makefile may want to define a post install target.
Makefile.pdlibbuilder should define only one installation target, that
can be defined as prerequisite for other targets. A stripping method is
still needed, but not this one.
This commit is contained in:
katjav 2018-03-12 08:47:08 +01:00
parent 6bfaba6df0
commit f334dd4e47
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile.pdlibbuilder
View file

@ -268,7 +268,6 @@ version = 0.5.0
# <sourcefile>.lst: make asm/source output file in current working directory # <sourcefile>.lst: make asm/source output file in current working directory
# #
# install: install executables and data files # install: install executables and data files
# install-strip: install executables (stripped) and data files
# clean: remove build products from source tree # clean: remove build products from source tree
# #
# help: print help text # help: print help text
@ -539,6 +538,7 @@ ifeq ($(system), Linux)
cxx.ldlibs := -lc -lm -lstdc++ cxx.ldlibs := -lc -lm -lstdc++
shared.extension = so shared.extension = so
shared.ldflags := -rdynamic -fPIC -shared -Wl,-soname,$(shared.lib) shared.ldflags := -rdynamic -fPIC -shared -Wl,-soname,$(shared.lib)
stripflags = --strip-unneeded -R .note -R .comment
endif endif
@ -566,6 +566,7 @@ ifeq ($(system), Darwin)
shared.ldflags = -dynamiclib -undefined dynamic_lookup \ shared.ldflags = -dynamiclib -undefined dynamic_lookup \
-install_name @loader_path/$(shared.lib) \ -install_name @loader_path/$(shared.lib) \
-compatibility_version 1 -current_version 1.0 -compatibility_version 1 -current_version 1.0
stripflags = -x
version.flag := $(filter $(cflags), -mmacosx-version-min=%) version.flag := $(filter $(cflags), -mmacosx-version-min=%)
ifeq ($(target.arch), i386) ifeq ($(target.arch), i386)
cxx.flags := -fcheck-new cxx.flags := -fcheck-new
@ -637,6 +638,7 @@ ifeq ($(system), Windows)
cxx.ldlibs := cxx.ldlibs :=
shared.extension = dll shared.extension = dll
shared.ldflags := -static-libgcc -shared "$(PDBINDIR)/pd.dll" shared.ldflags := -static-libgcc -shared "$(PDBINDIR)/pd.dll"
stripflags = --strip-unneeded -R .note -R .comment
endif endif
@ -1053,11 +1055,8 @@ endef
# -p = preserve time stamps # -p = preserve time stamps
# -m = set permission mode (as in chmod) # -m = set permission mode (as in chmod)
# -d = create all components of specified directories # -d = create all components of specified directories
# Use recursive expansion for INSTALL_PROGRAM because variable 'stripflags' is
# not defined yet, it is target-specific for 'install-strip'.
INSTALL = install INSTALL = install
INSTALL_PROGRAM = $(INSTALL) $(stripflags) -p -m 644 INSTALL_PROGRAM := $(INSTALL) -p -m 644
INSTALL_DATA := $(INSTALL) -p -m 644 INSTALL_DATA := $(INSTALL) -p -m 644
INSTALL_DIR := $(INSTALL) -m 755 -d INSTALL_DIR := $(INSTALL) -m 755 -d
@ -1093,13 +1092,6 @@ install-datadirs: all
$(info ++++ info: data directories of lib $(lib.name) installed \ $(info ++++ info: data directories of lib $(lib.name) installed \
from $(CURDIR) to $(installpath)) from $(CURDIR) to $(installpath))
# definition of strip command must be overridable from environment
STRIP ?= strip
# install everything while stripping symbols of executables
install-strip: stripflags := --strip-program=$(STRIP) -s
install-strip: install
################################################################################ ################################################################################
### rules: distribution targets ################################################ ### rules: distribution targets ################################################