luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified command line prep for Ruby integration - maybe that fixes the OpenSuSE 15 crashes.

This commit is contained in:
Matthias Koefferlein 2018-09-11 08:08:18 +02:00
parent e16a37d3af
commit 6536e9a8dc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rba/rba/rba.cc
View File

@ -1772,18 +1772,17 @@ RubyInterpreter::initialize (int &main_argc, char **main_argv, int (*main_func)
static char argv2[] = "__run_app__"; static char argv2[] = "__run_app__";
int argc = 3; int argc = 3;
char *argv[3]; char *argvv[3];
argv[0] = main_argv[0]; argvv[0] = main_argv[0];
// Hint: to keep ruby_options from reading stdin, we simulate a "-e" option with an empty script // Hint: to keep ruby_options from reading stdin, we simulate a "-e" option with an empty script
argv[1] = argv1; argvv[1] = argv1;
argv[2] = argv2; argvv[2] = argv2;
char **argv = argvv;
#if HAVE_RUBY_VERSION_CODE>=10900 #if HAVE_RUBY_VERSION_CODE>=10900
// Make sure we call ruby_sysinit because otherwise the program will crash (this // Make sure we call ruby_sysinit because otherwise the program will crash (this
// has been observed on Windows under MSVC 2017 with Ruby 2.5.1 for example) // has been observed on Windows under MSVC 2017 with Ruby 2.5.1 for example)
char **argvp = argv; ruby_sysinit (&argc, &argv);
int argcp = argc;
ruby_sysinit (&argcp, &argvp);
#endif #endif
{ {