beremiz

fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]

2016-04-22, Andrey Skvortsov
3a238c0c5993
Parents 62eb21aab1fb
Children d3f97b72c02a
fix regression introduced by changeset: 1431:28e9d479aa65 [Use '-p' command line option when running matiec (iec2c)]

Variable matiec_flags in c_ext.py and PythonFileCTNMixin.py is not
used for flags for matiec (IEC to C compiler) actually, but it's used
to compile C-code generated for extensions using normal C-compiler,
like gcc.
2 files changed, 4 insertions(+), 4 deletions(-)
  • +2 -2
    c_ext/c_ext.py
  • +2 -2
    py_ext/PythonFileCTNMixin.py
    • --- a/c_ext/c_ext.py Fri Apr 22 19:49:10 2016 +0300
    +++ b/c_ext/c_ext.py Fri Apr 22 21:26:31 2016 +0300
    @@ -99,7 +99,7 @@
    cfile.write(text)
    cfile.close()
    - matiec_flags = '"-l -p -I%s"'%os.path.abspath(self.GetCTRoot().GetIECLibPath())
    + matiec_CFLAGS = '"-I%s"'%os.path.abspath(self.GetCTRoot().GetIECLibPath())
    - return [(Gen_Cfile_path, str(self.CExtension.getCFLAGS() + matiec_flags))],str(self.CExtension.getLDFLAGS()),True
    + return [(Gen_Cfile_path, str(self.CExtension.getCFLAGS() + matiec_CFLAGS))],str(self.CExtension.getLDFLAGS()),True
    --- a/py_ext/PythonFileCTNMixin.py Fri Apr 22 19:49:10 2016 +0300
    +++ b/py_ext/PythonFileCTNMixin.py Fri Apr 22 21:26:31 2016 +0300
    @@ -258,10 +258,10 @@
    pycfile.write(PyCFileContent)
    pycfile.close()
    - matiec_flags = '"-l -p -I%s"'%os.path.abspath(
    + matiec_CFLAGS = '"-I%s"'%os.path.abspath(
    self.GetCTRoot().GetIECLibPath())
    - return ([(Gen_PyCfile_path, matiec_flags)],
    + return ([(Gen_PyCfile_path, matiec_CFLAGS)],
    "",
    True,
    ("runtime_%s.py"%location_str, file(runtimefile_path,"rb")))