Author: jsc
Date: Tue Oct 21 07:25:11 2014
New Revision: 1633294
URL: http://svn.apache.org/r1633294
Log:
#125776# adapt STL include path for Xcode 6
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=1633294&r1=1633293&r2=1633294&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Tue Oct 21 07:25:11 2014
@@ -1482,8 +1482,12 @@ elsif ($platform =~ m/darwin/)
{
$FRAMEWORKSHOME = "@MACOSX_SDK_PATH@/System/Library/Frameworks";
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";
+ my $STLINC =
"$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1/";
+ if ( !(-e $STLINC) && !(-d $STLINC) ) {
+ # Xcode 5
+ $STLINC =
"$TOOLSPATH/Toolchains/XcodeDefault.xctoolchain/usr/lib/c++/v1/";
+ }
+ $SOLARINC .= $I.$STLINC .
$I.$FRAMEWORKSHOME.$ds."JavaVM.framework".$ds."Headers";
$GUIBASE = "aqua";
}
else
