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

* configure.ac: Remove APPLE_CC and add -Wl,-allow_stack_execute on

Browse source 
Apple.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-28 17:58:33 +02:00
parent 0af1751d77
commit 6fd0b14394
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* configure.ac: Remove APPLE_CC and add -Wl,-allow_stack_execute on
Apple.
2012-05-28 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* gentpl.py: Ignore error 2022 in objconv since it's irrelevant for us. * gentpl.py: Ignore error 2022 in objconv since it's irrelevant for us.

7
configure.ac
View file

@ -301,8 +301,8 @@ AC_CHECK_SIZEOF(long)
grub_apple_cc grub_apple_cc
if test x$grub_cv_apple_cc = xyes ; then if test x$grub_cv_apple_cc = xyes ; then
HOST_CPPFLAGS="$HOST_CPPFLAGS -DAPPLE_CC=1 -fnested-functions" HOST_CPPFLAGS="$HOST_CPPFLAGS -fnested-functions"
HOST_CFLAGS="$HOST_CFLAGS" HOST_LDFLAGS="$HOST_LDFLAGS -Wl,-allow_stack_execute"
fi fi
if test x$USE_NLS = xno; then if test x$USE_NLS = xno; then
@ -453,10 +453,9 @@ fi
grub_apple_target_cc grub_apple_target_cc
if test x$grub_cv_apple_target_cc = xyes ; then if test x$grub_cv_apple_target_cc = xyes ; then
TARGET_CPPFLAGS="$TARGET_CPPFLAGS -DAPPLE_CC=1"
TARGET_CPPFLAGS="$TARGET_CPPFLAGS -fnested-functions" TARGET_CPPFLAGS="$TARGET_CPPFLAGS -fnested-functions"
CFLAGS="$CFLAGS -DAPPLE_CC=1 -fnested-functions" CFLAGS="$CFLAGS -fnested-functions"
TARGET_APPLE_CC=1 TARGET_APPLE_CC=1
AC_CHECK_PROG([OBJCONV], [objconv], [objconv], []) AC_CHECK_PROG([OBJCONV], [objconv], [objconv], [])
if test "x$OBJCONV" = x ; then if test "x$OBJCONV" = x ; then