modula3 / cm3

Critical Mass Modula-3
http://modula3.github.io/cm3/
Other
139 stars 25 forks source link

Fix slash style in case building cm3 for I386_DJGPP target #1022

Closed VictorMiasnikov closed 2 years ago

VictorMiasnikov commented 2 years ago
Fix slash style in case building cm3 for I386_DJGPP target

 Before:
==
...
gcc version 10.2.0 (GCC)
"d:/cm3/bin/config/I386_DJGPP", line 85: quake runtime error: exit 1: gpp -v -o
m3cggen  _m3main.o Main_m.o d:/cm3/pkg\m3middle\I386_DJGPP/libm3middle.a d:/cm3/
pkg\sysutils\I386_DJGPP/libsysutils.a d:/cm3/pkg\libm3\I386_DJGPP/libm3.a d:/cm3
/pkg\m3core\I386_DJGPP/libm3core.a
...
==

 after:
...

 d:/djgpp/bin/ld.exe -o m3cggen d:/djgpp/bin/../lib/gcc/djgpp/10/../../../crt0.o
 -Ld:/djgpp/bin/../lib/gcc/djgpp/10 -Ld:/djgpp/bin/../lib/gcc -Ld:/djgpp/bin/../
lib/gcc/djgpp/10/../../.. -Ld:/djgpp/lib _m3main.o Main_m.o d:/cm3/pkg/m3middle/
I386_DJGPP/libm3middle.a d:/cm3/pkg/sysutils/I386_DJGPP/libsysutils.a d:/cm3/pkg
/libm3/I386_DJGPP/libm3.a d:/cm3/pkg/m3core/I386_DJGPP/libm3core.a -lstdcxx -lm
-lgcc -lc -lgcc

   . . .

COLLECT_GCC_OPTIONS='-v' '-o' 'm3cggen' '-mtune=pentium' '-march=pentium'
 d:/djgpp/bin/stubify.exe -v m3cggen
stubify for djgpp V2.X executables, Copyright (C) 1995-2003 DJ Delorie
stubify: m3cggen -> m3cggen.exe
...

{{{
gcc version 10.2.0 (GCC)
"d:/cm3/bin/config/I386_DJGPP", line 85: quake runtime error: exit 1: gpp -v -o m3cggen  _m3main.o Main_m.o
 d:/cm3/pkg\m3middle\I386_DJGPP/libm3middle.a
 d:/cm3/pkg\sysutils\I386_DJGPP/libsysutils.a d:/cm3/pkg\libm3\I386_DJGPP/libm3.a
 d:/cm3/pkg\m3core\I386_DJGPP/libm3core.a

--procedure--  -line-  -file---
exec               --  <builtin>
m3_link            85  d:/cm3/bin/config/I386_DJGPP
Program            --  <builtin>
include_dir         7  d:/cm3/src/m3-sys/m3cggen\src\m3makefile
                    8  d:/cm3/src/m3-sys/m3cggen\I386_DJGPP\m3make.args

Fatal Error: procedure "m3_link" defined in "d:/cm3/bin\cm3.cfg" failed.

 *** execution of [<function _BuildGlobalFunction at 0x546a3c>, <function _ShipFunction at 0x546a74>] failed ***

ERROR: ./upgrade.py skipgcc c  c I386_DJGPP

D:\CM3\SRC\SCRIPTS\PYTHON>
}}}

==
.a d:/cm3/pkg/sysutils/I386_DJGPP/libsysutils.a d:/cm3/pkg/libm3/I386_DJGPP/libm
3.a d:/cm3/pkg/m3core/I386_DJGPP/libm3core.a
Using built-in specs.
COLLECT_GCC=d:/djgpp/bin/gpp.exe
Target: djgpp
Configured with: /gcc-10.20/configure djgpp --prefix=/dev/env/DJDIR --disable-we
rror --enable-languages=c,c++,objc,obj-c++,fortran,ada --with-gcc-major-version-
only --enable-libquadmath-support --enable-lto --disable-libstdcxx-pch --enable-
libstdcxx-filesystem-ts
Thread model: single
Supported LTO compression algorithms: zlib
gcc version 10.2.0 (GCC)
COMPILER_PATH=d:/djgpp/bin/
LIBRARY_PATH=d:/djgpp/bin/../lib/gcc/djgpp/10/;d:/djgpp/bin/../lib/gcc/;d:/djgpp
/bin/../lib/gcc/djgpp/10/../../../;d:/djgpp/lib/
COLLECT_GCC_OPTIONS='-v' '-o' 'm3cggen' '-mtune=pentium' '-march=pentium'
 d:/djgpp/bin/ld.exe -o m3cggen d:/djgpp/bin/../lib/gcc/djgpp/10/../../../crt0.o
 -Ld:/djgpp/bin/../lib/gcc/djgpp/10 -Ld:/djgpp/bin/../lib/gcc -Ld:/djgpp/bin/../
lib/gcc/djgpp/10/../../.. -Ld:/djgpp/lib _m3main.o Main_m.o d:/cm3/pkg/m3middle/
I386_DJGPP/libm3middle.a d:/cm3/pkg/sysutils/I386_DJGPP/libsysutils.a d:/cm3/pkg
/libm3/I386_DJGPP/libm3.a d:/cm3/pkg/m3core/I386_DJGPP/libm3core.a -lstdcxx -lm
-lgcc -lc -lgcc
COLLECT_GCC_OPTIONS='-v' '-o' 'm3cggen' '-mtune=pentium' '-march=pentium'
 d:/djgpp/bin/stubify.exe -v m3cggen
stubify for djgpp V2.X executables, Copyright (C) 1995-2003 DJ Delorie
stubify: m3cggen -> m3cggen.exe

D:\CM3\SRC\M3-SYS\M3CGGEN>
==
VictorMiasnikov commented 2 years ago

( Possible dubl)

 18.04.2022, 10:23, "Jay Krell" @.**@. commented on this pull request.In m3- sys/cminstall/src/config/I386_DJGPP:> @@ -83,6 +84,9 @@ proc compile_c(source, object, options, optimize, debug) is end

I.e. without imported_libs = ConvertLibsToStandalone(imported_libs, shared) ?

I simply was not tested this variant. I think it can be worked / good variant too

I can prepare another pool request

VictorMiasnikov commented 2 years ago

I can prepare another pool request

Do it?

P.S. Done. See later.

VictorMiasnikov commented 2 years ago

I prepare pool request https://github.com/modula3/cm3/pull/1023

VictorMiasnikov commented 2 years ago

see #1023 ( and future patch)