Kaydet (Commit) 45ffc53a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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 261f1439.
üst 8fe9a68f
...@@ -199,18 +199,9 @@ static sal_Bool getFromCommandLineArgs( ...@@ -199,18 +199,9 @@ static sal_Bool getFromCommandLineArgs(
} }
rtl_uString_release( pArg ); rtl_uString_release( pArg );
} }
// If osl_setCommandArgs() has not been called yet (for pNameValueList = &nameValueList;
// 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;
} }
if( ! pNameValueList )
return sal_False;
sal_Bool found = sal_False; sal_Bool found = sal_False;
for( NameValueList::iterator ii = pNameValueList->begin() ; for( NameValueList::iterator ii = pNameValueList->begin() ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment