[llvm-commits] [llvm-gcc-4.2] r114961 - in /llvm-gcc-4.2/trunk/gcc: ChangeLog.apple doc/cppopts.texi doc/invoke.texi

[Bob Wilson]

Author: bwilson
Date: Tue Sep 28 11:34:33 2010
New Revision: 114961

URL: http://llvm.org/viewvc/llvm-project?rev=114961&view=rev
Log:
Merge a doc fix from Apple's gcc for the -isysroot and --sysroot options.

Modified:
    llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
    llvm-gcc-4.2/trunk/gcc/doc/cppopts.texi
    llvm-gcc-4.2/trunk/gcc/doc/invoke.texi

Modified: llvm-gcc-4.2/trunk/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ChangeLog.apple?rev=114961&r1=114960&r2=114961&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/trunk/gcc/ChangeLog.apple Tue Sep 28 11:34:33 2010
@@ -1,3 +1,10 @@
+2010-09-27  Bob Wilson  <bob.wilson at apple.com>
+
+	Radar 8392704
+	* doc/cppopts.texi: Fix description of -isysroot for Apple's GCC.
+	* doc/invoke.texi (Directory Options): Update --sysroot description to
+	refer Apple users to -isysroot.
+
 2010-08-13  Bob Wilson  <bob.wilson at apple.com>
 
 	Radar 8307333

Modified: llvm-gcc-4.2/trunk/gcc/doc/cppopts.texi
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/doc/cppopts.texi?rev=114961&r1=114960&r2=114961&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/doc/cppopts.texi (original)
+++ llvm-gcc-4.2/trunk/gcc/doc/cppopts.texi Tue Sep 28 11:34:33 2010
@@ -491,7 +491,10 @@
 @item -isysroot @var{dir}
 @opindex isysroot
 This option is like the @option{--sysroot} option, but applies only to
-header files.  See the @option{--sysroot} option for more information.
+header files, except for Apple's version of GCC, where it applies to
+both header files and libraries and effectively replaces the
+ at option{--sysroot} option.
+See the @option{--sysroot} option for more information.
 
 @item -imultilib @var{dir}
 @opindex imultilib

Modified: llvm-gcc-4.2/trunk/gcc/doc/invoke.texi
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/doc/invoke.texi?rev=114961&r1=114960&r2=114961&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/doc/invoke.texi (original)
+++ llvm-gcc-4.2/trunk/gcc/doc/invoke.texi Tue Sep 28 11:34:33 2010
@@ -7540,7 +7540,10 @@
 @file{/usr/include} and libraries in @file{/usr/lib}, it will instead
 search @file{@var{dir}/usr/include} and @file{@var{dir}/usr/lib}.  
 
-If you use both this option and the @option{-isysroot} option, then
+With Apple's version of GCC, this option is effectively replaced by
+ at option{-isysroot}, which you should use instead of @option{--sysroot}.
+For other (non-Apple) versions of GCC,
+if you use both this option and the @option{-isysroot} option, then
 the @option{--sysroot} option will apply to libraries, but the
 @option{-isysroot} option will apply to header files.