Author: hdu Date: Thu May 8 08:36:03 2014 New Revision: 1593205 URL: http://svn.apache.org/r1593205 Log: #i124422# adjust include path for libc++ headers to the selected XCode folder
While XCode5's xcode-select supports the -p and --print-path options, XCode4 officially only knows -print-path. XCode4 seems to tolerate --print-path though (tested on XCode4.6), so this can be universally used. Patch-by: Thorsten Wagner <[email protected]> Review-by: Herbert Duerr <[email protected]> Modified: openoffice/trunk/main/set_soenv.in Modified: openoffice/trunk/main/set_soenv.in URL: http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1593205&r1=1593204&r2=1593205&view=diff ============================================================================== --- openoffice/trunk/main/set_soenv.in (original) +++ openoffice/trunk/main/set_soenv.in Thu May 8 08:36:03 2014 @@ -1441,7 +1441,8 @@ elsif ($platform =~ m/cygwin/) elsif ($platform =~ m/darwin/) { $FRAMEWORKSHOME = "@MACOSX_SDK_PATH@/System/Library/Frameworks"; - my $STLINC .= $I."/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; + chomp( my $TOOLSPATH = `xcode-select --print-path` ); + my $STLINC .= $I."$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/"; $SOLARINC .= $STLINC . $I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers"; $GUIBASE = "aqua"; }
