diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-15 17:45:57 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-09-04 16:01:06 +0200 |
| commit | 64761ce9a899954a12d8e3ae8b400c5ad9648137 (patch) | |
| tree | fb3e5bc7645158fdcb530803d4a9ab9d09ff5e73 /rules | |
| parent | 19c6049a3d718a3200feab644d6bbbc6b5f2e74b (diff) | |
| download | haskell-64761ce9a899954a12d8e3ae8b400c5ad9648137.tar.gz | |
Build system: implement `make install-strip` (#1851)
Reviewed by: bgamari
Differential Revision: https://phabricator.haskell.org/D1209
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-perl.mk | 7 | ||||
| -rw-r--r-- | rules/build-prog.mk | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/rules/build-perl.mk b/rules/build-perl.mk index b943e16621..5a1660c0d7 100644 --- a/rules/build-perl.mk +++ b/rules/build-perl.mk @@ -66,10 +66,13 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/. endif ifeq "$$($1_$2_INSTALL)" "YES" +# Don't add to INSTALL_BINS or INSTAL_TOPDIR_BINS, because they will get +# stripped when calling 'make install-strip', and stripping a Perl script +# doesn't work. ifeq "$$($1_$2_TOPDIR)" "YES" -INSTALL_TOPDIRS += $$($1_$2_INPLACE) +INSTALL_TOPDIR_SCRIPTS += $$($1_$2_INPLACE) else -INSTALL_BINS += $$($1_$2_INPLACE) +INSTALL_SCRIPTS += $$($1_$2_INPLACE) endif endif diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 1029fdd3ea..f09a8c1f6e 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -302,7 +302,7 @@ endif ifeq "$$($1_$2_WANT_INSTALLED_WRAPPER)" "YES" INSTALL_LIBEXECS += $1/$2/build/tmp/$$($1_$2_PROG) else ifeq "$$($1_$2_TOPDIR)" "YES" -INSTALL_TOPDIRS += $1/$2/build/tmp/$$($1_$2_PROG) +INSTALL_TOPDIR_BINS += $1/$2/build/tmp/$$($1_$2_PROG) else INSTALL_BINS += $1/$2/build/tmp/$$($1_$2_PROG) endif |