diff options
| author | Hollis Blanchard <hollis@penguinppc.org> | 2010-08-04 17:21:34 -0700 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2010-08-26 18:18:26 +0200 |
| commit | 52ba784d357fac20e137cf1393437437c43a3fc4 (patch) | |
| tree | 1cfffeaad85e1a6f72652928df111535da20f973 | |
| parent | 419ef5f1c6a9614e8ddcb0b0f826de692e7e4a43 (diff) | |
Fix "make install" with a cross toolchain
We must be able to use a non-native strip executable, but not all
versions of 'install' support the --strip-program option (e.g.
OpenBSD). Accordingly, we can't use 'install -s', and we must run strip
separately.
Signed-off-by: Hollis Blanchard <hollis@penguinppc.org>
Cc: blauwirbel@gmail.com
| -rw-r--r-- | Makefile.target | 5 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.target b/Makefile.target index c8281e90a9..18826bb356 100644 --- a/Makefile.target +++ b/Makefile.target @@ -329,7 +329,10 @@ clean: install: all ifneq ($(PROGS),) - $(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)" + $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)" +ifneq ($(STRIP),) + $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS)) +endif endif # Include automatically generated dependency files @@ -80,6 +80,7 @@ make="make" install="install" objcopy="objcopy" ld="ld" +strip="strip" helper_cflags="" libs_softmmu="" libs_tools="" @@ -125,6 +126,7 @@ cc="${cross_prefix}${cc}" ar="${cross_prefix}${ar}" objcopy="${cross_prefix}${objcopy}" ld="${cross_prefix}${ld}" +strip="${cross_prefix}${strip}" # default flags for all hosts QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS" @@ -2227,7 +2229,7 @@ if test "$debug" = "yes" ; then echo "CONFIG_DEBUG_EXEC=y" >> $config_host_mak fi if test "$strip_opt" = "yes" ; then - echo "STRIP_OPT=-s" >> $config_host_mak + echo "STRIP=${strip}" >> $config_host_mak fi if test "$bigendian" = "yes" ; then echo "HOST_WORDS_BIGENDIAN=y" >> $config_host_mak |