* grub-core/genmod.sh.in: Strip before converting to ELF as strip

	may not work with ELF.

diff --git a/ChangeLog b/ChangeLog
index 5824c165fe3a828174892ae2bc2623857422a089..179bc3c03760bad75ab5c3677e159a83e326e518 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/genmod.sh.in: Strip before converting to ELF as strip
+       may not work with ELF.
+
 2013-12-16  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Use unix functions for temporary files and special files on cygwin.

diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
index 40a3bc3e53270cdce2a2c8a221836c42c227e723..789732b108ba09affaf11e56e4883dcc9ce4c412 100644 (file)
--- a/grub-core/genmod.sh.in
+++ b/grub-core/genmod.sh.in
@@ -53,9 +53,6 @@ if test x@TARGET_APPLE_LINKER@ != x1; then
     fi
     rm -f $t1 $t2
 
-       if ! test -z "${TARGET_OBJ2ELF}"; then
-           "${TARGET_OBJ2ELF}" $tmpfile || exit 1
-       fi
        if test x@platform@ != xemu; then
            @TARGET_STRIP@ --strip-unneeded \
                -K grub_mod_init -K grub_mod_fini \
@@ -63,6 +60,9 @@ if test x@TARGET_APPLE_LINKER@ != x1; then
                -R .note.gnu.gold-version -R .note.GNU-stack \
                -R .note -R .comment $tmpfile || exit 1
        fi
+       if ! test -z "${TARGET_OBJ2ELF}"; then
+           "${TARGET_OBJ2ELF}" $tmpfile || exit 1
+       fi
 else
     tmpfile2=${outfile}.tmp2
     t1=${outfile}.t1.c