vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* gentpl.py (kernel): Remove the use of TARGET_OBJ2ELF after strip since

Browse source 
strip already transforms he format.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-03-02 11:11:00 +01:00
parent 9e95e1bf6b
commit ad5518d79b
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* gentpl.py (kernel): Remove the use of TARGET_OBJ2ELF after strip since
strip already transforms he format.
2012-03-02 Vladimir Serbinenko <phcoder@gmail.com> 2012-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* conf/i386-pc-cygwin-img-ld.sc: Define also _edata and __edata. * conf/i386-pc-cygwin-img-ld.sc: Define also _edata and __edata.

3
gentpl.py
View file

@ -426,9 +426,6 @@ def kernel(platform):
"""if test x$(USE_APPLE_CC_FIXES) = xyes; then \ """if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(STRIP) $(""" + cname() + """) -o $@.bin $<; \ $(STRIP) $(""" + cname() + """) -o $@.bin $<; \
$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2031 -ed2022 -wd1106 -nu -nd $@.bin $@; \ $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2031 -ed2022 -wd1106 -nu -nd $@.bin $@; \
elif test ! -z '$(TARGET_OBJ2ELF)'; then \
$(STRIP) $(""" + cname() + """_STRIPFLAGS) -o $@ $<;\
$(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \
else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \ else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \
fi""")) fi"""))
return r return r