From 45ffc53a905aa4b4890d862a070a2d6e9bce8546 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 9 Oct 2013 11:52:19 +0300 Subject: Revert "Don't ignore -env: command line parameters in some cases" This was the wrong way to fix the problem. The root cause was a static initialiser in the OpenCL code, and that code should not even have been built for iOS. This reverts commit 261f1439e5516f6d60317a675d261af330a9a74c. --- sal/rtl/bootstrap.cxx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'sal') diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 5ee61b0a19ba..a4169b3b66b9 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -199,18 +199,9 @@ static sal_Bool getFromCommandLineArgs( } rtl_uString_release( pArg ); } - // If osl_setCommandArgs() has not been called yet (for - // instance, if this gets called from a static initialiser), - // don't initialise pNameValueList, as that would cause the - // code to ignore any -env:FOO=BAR on the command line once - // osl is told about it. - if( nArgCount > 0 ) - pNameValueList = &nameValueList; + pNameValueList = &nameValueList; } - if( ! pNameValueList ) - return sal_False; - sal_Bool found = sal_False; for( NameValueList::iterator ii = pNameValueList->begin() ; -- cgit