PR other/46202: implement install-strip.
/: PR other/46202 * configure.ac: Fix just-built in-tree STRIP name to be binutils/strip-new. * configure: Regenerate. * Makefile.def (install-strip-gcc, install-strip-binutils) (install-strip-opcodes, install-strip-ld, install-strip-itcl) (install-strip-sid): Mirror dependencies on non-strip variants of these targets on the respective -strip prerequisites. * Makefile.tpl (install-strip, install-strip-host) (install-strip-target): New targets. (install-strip-[+module+], install-strip-target-[+module+]): New targets. * Makefile.in: Regenerate. etc/: * Makefile.in (install-strip): New target. libiberty/: PR other/46202 * Makefile.in (install-strip): New phony target. (install): Also mark as phony.
This commit is contained in:
Ralf Wildenhues
parent
d5b7129a70
commit
6f396dc7c0
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
PR other/46202
|
||||
* configure.ac: Fix just-built in-tree STRIP name to be
|
||||
binutils/strip-new.
|
||||
* configure: Regenerate.
|
||||
* Makefile.def (install-strip-gcc, install-strip-binutils)
|
||||
(install-strip-opcodes, install-strip-ld, install-strip-itcl)
|
||||
(install-strip-sid): Mirror dependencies on non-strip variants
|
||||
of these targets on the respective -strip prerequisites.
|
||||
* Makefile.tpl (install-strip, install-strip-host)
|
||||
(install-strip-target): New targets.
|
||||
(install-strip-[+module+], install-strip-target-[+module+]):
|
||||
New targets.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2010-11-19 Ian Lance Taylor <iant@google.com>
|
||||
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
|
|
|
|||
|
|
@ -350,6 +350,7 @@ dependencies = { module=dvi-gcc; on=all-build-libiberty; };
|
|||
dependencies = { module=pdf-gcc; on=all-build-libiberty; };
|
||||
dependencies = { module=html-gcc; on=all-build-libiberty; };
|
||||
dependencies = { module=install-gcc ; on=install-fixincludes; };
|
||||
dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; };
|
||||
|
||||
dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; };
|
||||
dependencies = { module=configure-libcpp; on=configure-intl; };
|
||||
|
|
@ -411,9 +412,11 @@ dependencies = { module=all-binutils; on=all-intl; };
|
|||
// binutils might be on PATH, and they might need the shared opcodes
|
||||
// library.
|
||||
dependencies = { module=install-binutils; on=install-opcodes; };
|
||||
dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
|
||||
|
||||
// libopcodes depends on libbfd
|
||||
dependencies = { module=install-opcodes; on=install-bfd; };
|
||||
dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
|
||||
|
||||
dependencies = { module=configure-gas; on=configure-intl; };
|
||||
dependencies = { module=all-gas; on=all-libiberty; };
|
||||
|
|
@ -434,6 +437,7 @@ dependencies = { module=all-ld; on=all-build-byacc; };
|
|||
dependencies = { module=all-ld; on=all-build-flex; };
|
||||
dependencies = { module=all-ld; on=all-intl; };
|
||||
dependencies = { module=install-ld; on=install-gold; };
|
||||
dependencies = { module=install-strip-ld; on=install-strip-gold; };
|
||||
dependencies = { module=configure-gold; on=configure-intl; };
|
||||
dependencies = { module=all-gold; on=all-libiberty; };
|
||||
dependencies = { module=all-gold; on=all-intl; };
|
||||
|
|
@ -464,6 +468,7 @@ dependencies = { module=configure-itcl; on=configure-tk; };
|
|||
dependencies = { module=all-itcl; on=all-tcl; };
|
||||
dependencies = { module=all-itcl; on=all-tk; };
|
||||
dependencies = { module=install-itcl; on=install-tcl; };
|
||||
dependencies = { module=install-strip-itcl; on=install-strip-tcl; };
|
||||
|
||||
dependencies = { module=configure-tk; on=configure-tcl; };
|
||||
dependencies = { module=all-tk; on=all-tcl; };
|
||||
|
|
@ -474,7 +479,9 @@ dependencies = { module=all-sid; on=all-opcodes; };
|
|||
dependencies = { module=all-sid; on=all-tcl; };
|
||||
dependencies = { module=all-sid; on=all-tk; };
|
||||
dependencies = { module=install-sid; on=install-tcl; };
|
||||
dependencies = { module=install-strip-sid; on=install-strip-tcl; };
|
||||
dependencies = { module=install-sid; on=install-tk; };
|
||||
dependencies = { module=install-strip-sid; on=install-strip-tk; };
|
||||
|
||||
dependencies = { module=configure-sim; on=configure-intl; };
|
||||
dependencies = { module=all-sim; on=all-intl; };
|
||||
|
|
|
|||
1577
Makefile.in
1577
Makefile.in
File diff suppressed because it is too large
Load Diff
59
Makefile.tpl
59
Makefile.tpl
|
|
@ -889,6 +889,26 @@ install.all: install-no-fixedincludes
|
|||
install-no-fixedincludes: installdirs install-host-nogcc \
|
||||
install-target gcc-no-fixedincludes
|
||||
|
||||
.PHONY: install-strip
|
||||
install-strip:
|
||||
@: $(MAKE); $(unstage)
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-strip-host install-strip-target
|
||||
|
||||
.PHONY: install-strip-host
|
||||
install-strip-host: [+
|
||||
FOR host_modules +] \
|
||||
maybe-install-strip-[+module+][+
|
||||
ENDFOR host_modules +]
|
||||
|
||||
.PHONY: install-strip-target
|
||||
install-strip-target: [+
|
||||
FOR target_modules +] \
|
||||
maybe-install-strip-target-[+module+][+
|
||||
ENDFOR target_modules +]
|
||||
|
||||
|
||||
### other supporting targets
|
||||
|
||||
MAKEDIRS= \
|
||||
|
|
@ -1174,6 +1194,23 @@ install-[+module+]: installdirs
|
|||
[+ ENDIF no_install +]
|
||||
@endif [+module+]
|
||||
|
||||
.PHONY: install-strip-[+module+] maybe-install-strip-[+module+]
|
||||
maybe-install-strip-[+module+]:
|
||||
@if [+module+]
|
||||
maybe-install-strip-[+module+]: install-strip-[+module+]
|
||||
[+ IF no_install +]
|
||||
install-strip-[+module+]:
|
||||
[+ ELSE install +]
|
||||
install-strip-[+module+]: installdirs
|
||||
@: $(MAKE); $(unstage)
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
||||
$(HOST_EXPORTS) \
|
||||
(cd $(HOST_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install-strip)
|
||||
[+ ENDIF no_install +]
|
||||
@endif [+module+]
|
||||
|
||||
# Other targets (info, dvi, pdf, etc.)
|
||||
[+ FOR recursive_targets +]
|
||||
.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
|
||||
|
|
@ -1286,6 +1323,28 @@ ENDIF raw_cxx +]
|
|||
[+ ENDIF no_install +]
|
||||
@endif target-[+module+]
|
||||
|
||||
.PHONY: install-strip-target-[+module+] maybe-install-strip-target-[+module+]
|
||||
maybe-install-strip-target-[+module+]:
|
||||
@if target-[+module+]
|
||||
maybe-install-strip-target-[+module+]: install-strip-target-[+module+]
|
||||
[+ IF no_install +]
|
||||
# Dummy target for uninstallable.
|
||||
install-strip-target-[+module+]:
|
||||
[+ ELSE install +]
|
||||
install-strip-target-[+module+]: installdirs
|
||||
@: $(MAKE); $(unstage)
|
||||
@r=`${PWD_COMMAND}`; export r; \
|
||||
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+
|
||||
IF raw_cxx +]
|
||||
$(RAW_CXX_TARGET_EXPORTS) \[+
|
||||
ELSE normal_cxx +]
|
||||
$(NORMAL_TARGET_EXPORTS) \[+
|
||||
ENDIF raw_cxx +]
|
||||
(cd $(TARGET_SUBDIR)/[+module+] && \
|
||||
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install-strip)
|
||||
[+ ENDIF no_install +]
|
||||
@endif target-[+module+]
|
||||
|
||||
# Other targets (info, dvi, pdf, etc.)
|
||||
[+ FOR recursive_targets +]
|
||||
.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]
|
||||
|
|
|
|||
|
|
@ -13813,7 +13813,7 @@ else
|
|||
|
||||
if test $ok = yes; then
|
||||
# An in-tree tool is available and we can use it
|
||||
STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip'
|
||||
STRIP_FOR_TARGET='$$r/$(HOST_SUBDIR)/binutils/strip-new'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
|
||||
$as_echo "just compiled" >&6; }
|
||||
elif expr "x$STRIP_FOR_TARGET" : "x/" > /dev/null; then
|
||||
|
|
|
|||
|
|
@ -3204,7 +3204,7 @@ GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
|
|||
GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
|
||||
GCC_TARGET_TOOL(objdump, OBJDUMP_FOR_TARGET, OBJDUMP, [binutils/objdump])
|
||||
GCC_TARGET_TOOL(ranlib, RANLIB_FOR_TARGET, RANLIB, [binutils/ranlib])
|
||||
GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip])
|
||||
GCC_TARGET_TOOL(strip, STRIP_FOR_TARGET, STRIP, [binutils/strip-new])
|
||||
GCC_TARGET_TOOL(windres, WINDRES_FOR_TARGET, WINDRES, [binutils/windres])
|
||||
GCC_TARGET_TOOL(windmc, WINDMC_FOR_TARGET, WINDMC, [binutils/windmc])
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2010-11-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
* Makefile.in (install-strip): New target.
|
||||
|
||||
2010-06-08 Nick Clifton <nickc@redhat.com>
|
||||
|
||||
* standards.texi: Import current version from gnustandards
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ PDFFILES = standards.pdf configure.pdf
|
|||
HTMLFILES = standards.html configure.html
|
||||
|
||||
all: info
|
||||
install: install-info
|
||||
install install-strip: install-info
|
||||
|
||||
uninstall:
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue