summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Antoine Perennou <Marc-Antoine@Perennou.com>2015-04-08 22:33:54 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2015-04-11 12:48:18 +0200
commitc4a77bcb9a50f152557e25c90837d8bfef858729 (patch)
tree5e191a68e93dbbfbd1573780e54203dc90a0a633
parentconfigure: allow setting EFI_CC (diff)
downloadsystemd-c4a77bcb9a50f152557e25c90837d8bfef858729.tar.xz
systemd-c4a77bcb9a50f152557e25c90837d8bfef858729.zip
build: allow setting OBJCOPY
Diffstat (limited to '')
-rw-r--r--Makefile.am4
-rw-r--r--configure.ac1
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 453b524eb5..72a2c3c220 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2632,7 +2632,7 @@ $(systemd_boot_solib): $(systemd_boot_objects)
nm -D -u $@ | grep ' U ' && exit 1 || :
$(systemd_boot): $(systemd_boot_solib)
- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
+ $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
# ------------------------------------------------------------------------------
@@ -2669,7 +2669,7 @@ $(stub_solib): $(stub_objects)
nm -D -u $@ | grep ' U ' && exit 1 || :
$(stub): $(stub_solib)
- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
+ $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
-j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
# ------------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 28cec8fb69..4ff70950f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1])
AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
enable_introspection=no])
+AC_CHECK_TOOL(OBJCOPY, objcopy)
AC_CHECK_TOOL(STRINGS, strings)
AC_CHECK_TOOL(GPERF, gperf)
if test -z "$GPERF" ; then