diff options
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 4 | ||||
| -rw-r--r-- | fixincludes/mkheaders.in | 20 |
2 files changed, 19 insertions, 5 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index b8c37a5e756..1efabd5f403 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,7 @@ +2007-02-04 Mike Stump <mrs@apple.com> + + * mkheaders.in: Allow optional isysroot parameter. + 2007-02-03 Bruce Korb <bkorb@gnu.org> * inclhack.def (glibc_c99_inline_4): replace "extern" only if diff --git a/fixincludes/mkheaders.in b/fixincludes/mkheaders.in index 6f029f8cf84..29f27f15972 100644 --- a/fixincludes/mkheaders.in +++ b/fixincludes/mkheaders.in @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2007 Free Software Foundation, Inc. #This file is part of GCC. @@ -32,7 +32,7 @@ done export VERBOSE if [ x$1 = x--help ] ; then - echo "Usage: mkheaders [options] [prefix]" + echo "Usage: mkheaders [options] [prefix [isysroot]]" echo "Options:" echo " -v Print more output (may be repeated for even more output)" echo " --help This help" @@ -42,7 +42,7 @@ fi if [ x$1 = x--version ] ; then echo "mkheaders (GCC) version $version" - echo "Copyright 2002 Free Software Foundation, Inc." + echo "Copyright 2002, 2007 Free Software Foundation, Inc." echo "This program is free software; you may redistribute it under the" echo "terms of the GNU General Public License. This program has" echo "absolutely no warranty." @@ -52,9 +52,19 @@ fi # Common prefix for installation directories. if [ x$1 != x ] ; then prefix=$1 + shift else prefix=@prefix@ fi + +# Allow for alternate isysroot in which to find headers +if [ x$1 != x ] ; then + isysroot=$1 + shift +else + isysroot= +fi + # Directory in which to put host dependent programs and libraries exec_prefix=@exec_prefix@ # Directory in which to put the directories used by the compiler. @@ -78,7 +88,7 @@ if [ x${STMP_FIXINC} != x ] ; then TARGET_MACHINE="${target}" target_canonical="${target}" \ MACRO_LIST="${itoolsdatadir}/macro_list" \ @SHELL@ ./fixinc.sh ${incdir} \ - ${SYSTEM_HEADER_DIR} ${OTHER_FIXINCLUDES_DIRS} + ${isysroot}${SYSTEM_HEADER_DIR} ${OTHER_FIXINCLUDES_DIRS} rm -f ${incdir}/syslimits.h if [ -f ${incdir}/limits.h ]; then mv ${incdir}/limits.h ${incdir}/syslimits.h @@ -92,5 +102,5 @@ cp ${itoolsdatadir}/include/* ${incdir} if [ x${STMP_FIXPROTO} != x ] ; then mkinstalldirs="@SHELL@ ${itoolsdir}/mkinstalldirs" export FIXPROTO_DEFINES mkinstalldirs - @SHELL@ fixproto ${incdir} ${incdir} ${SYSTEM_HEADER_DIR} || exit 1 + @SHELL@ fixproto ${incdir} ${incdir} ${isysroot}${SYSTEM_HEADER_DIR} || exit 1 fi |