Fossil SCM
Further compiler portability enhancements in the MinGW makefiles.
Commit
de609c7cac37d95efb9c57689d1ac02c83feee3e
Parent
1bb6f3d34c42967…
3 files changed
+20
-4
+20
-4
+20
-4
+20
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -516,17 +516,25 @@ | ||
| 516 | 516 | SRCDIR = src |
| 517 | 517 | |
| 518 | 518 | #### The directory into which object code files should be written. |
| 519 | 519 | # |
| 520 | 520 | OBJDIR = wbld |
| 521 | + | |
| 522 | +#### C compiler for use in building executables that will run on | |
| 523 | +# the platform that is doing the build. This is used to compile | |
| 524 | +# code-generator programs as part of the build process. See TCC | |
| 525 | +# and TCCEXE below for the C compiler for building the finished | |
| 526 | +# binary. | |
| 527 | +# | |
| 528 | +BCCEXE = gcc | |
| 521 | 529 | |
| 522 | 530 | #### C Compiler and options for use in building executables that |
| 523 | 531 | # will run on the platform that is doing the build. This is used |
| 524 | 532 | # to compile code-generator programs as part of the build process. |
| 525 | 533 | # See TCC below for the C compiler for building the finished binary. |
| 526 | 534 | # |
| 527 | -BCC = gcc | |
| 535 | +BCC = $(BCCEXE) | |
| 528 | 536 | |
| 529 | 537 | #### Enable compiling with debug symbols (much larger binary) |
| 530 | 538 | # |
| 531 | 539 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 532 | 540 | |
| @@ -687,17 +695,25 @@ | ||
| 687 | 695 | else |
| 688 | 696 | LIBTCL = -ltcl86 |
| 689 | 697 | TCLTARGET = binaries |
| 690 | 698 | endif |
| 691 | 699 | |
| 692 | -#### C Compile and options for use in building executables that | |
| 693 | -# will run on the target platform. This is usually the same | |
| 700 | +#### C compiler for use in building executables that will run on the | |
| 701 | +# target platform. This is usually the same as BCCEXE, unless you | |
| 702 | +# are cross-compiling. This C compiler builds the finished binary | |
| 703 | +# for fossil. See BCC and BCCEXE above for the C compiler for | |
| 704 | +# building intermediate code-generator tools. | |
| 705 | +# | |
| 706 | +TCCEXE = gcc | |
| 707 | + | |
| 708 | +#### C compiler and options for use in building executables that will | |
| 709 | +# run on the target platform. This is usually the almost the same | |
| 694 | 710 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 695 | 711 | # the finished binary for fossil. The BCC compiler above is used |
| 696 | 712 | # for building intermediate code-generator tools. |
| 697 | 713 | # |
| 698 | -TCC = $(PREFIX)gcc -Wall | |
| 714 | +TCC = $(PREFIX)$(TCCEXE) -Wall | |
| 699 | 715 | |
| 700 | 716 | #### Add the necessary command line options to build with debugging |
| 701 | 717 | # symbols, if enabled. |
| 702 | 718 | # |
| 703 | 719 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 704 | 720 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -516,17 +516,25 @@ | |
| 516 | SRCDIR = src |
| 517 | |
| 518 | #### The directory into which object code files should be written. |
| 519 | # |
| 520 | OBJDIR = wbld |
| 521 | |
| 522 | #### C Compiler and options for use in building executables that |
| 523 | # will run on the platform that is doing the build. This is used |
| 524 | # to compile code-generator programs as part of the build process. |
| 525 | # See TCC below for the C compiler for building the finished binary. |
| 526 | # |
| 527 | BCC = gcc |
| 528 | |
| 529 | #### Enable compiling with debug symbols (much larger binary) |
| 530 | # |
| 531 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 532 | |
| @@ -687,17 +695,25 @@ | |
| 687 | else |
| 688 | LIBTCL = -ltcl86 |
| 689 | TCLTARGET = binaries |
| 690 | endif |
| 691 | |
| 692 | #### C Compile and options for use in building executables that |
| 693 | # will run on the target platform. This is usually the same |
| 694 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 695 | # the finished binary for fossil. The BCC compiler above is used |
| 696 | # for building intermediate code-generator tools. |
| 697 | # |
| 698 | TCC = $(PREFIX)gcc -Wall |
| 699 | |
| 700 | #### Add the necessary command line options to build with debugging |
| 701 | # symbols, if enabled. |
| 702 | # |
| 703 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 704 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -516,17 +516,25 @@ | |
| 516 | SRCDIR = src |
| 517 | |
| 518 | #### The directory into which object code files should be written. |
| 519 | # |
| 520 | OBJDIR = wbld |
| 521 | |
| 522 | #### C compiler for use in building executables that will run on |
| 523 | # the platform that is doing the build. This is used to compile |
| 524 | # code-generator programs as part of the build process. See TCC |
| 525 | # and TCCEXE below for the C compiler for building the finished |
| 526 | # binary. |
| 527 | # |
| 528 | BCCEXE = gcc |
| 529 | |
| 530 | #### C Compiler and options for use in building executables that |
| 531 | # will run on the platform that is doing the build. This is used |
| 532 | # to compile code-generator programs as part of the build process. |
| 533 | # See TCC below for the C compiler for building the finished binary. |
| 534 | # |
| 535 | BCC = $(BCCEXE) |
| 536 | |
| 537 | #### Enable compiling with debug symbols (much larger binary) |
| 538 | # |
| 539 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 540 | |
| @@ -687,17 +695,25 @@ | |
| 695 | else |
| 696 | LIBTCL = -ltcl86 |
| 697 | TCLTARGET = binaries |
| 698 | endif |
| 699 | |
| 700 | #### C compiler for use in building executables that will run on the |
| 701 | # target platform. This is usually the same as BCCEXE, unless you |
| 702 | # are cross-compiling. This C compiler builds the finished binary |
| 703 | # for fossil. See BCC and BCCEXE above for the C compiler for |
| 704 | # building intermediate code-generator tools. |
| 705 | # |
| 706 | TCCEXE = gcc |
| 707 | |
| 708 | #### C compiler and options for use in building executables that will |
| 709 | # run on the target platform. This is usually the almost the same |
| 710 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 711 | # the finished binary for fossil. The BCC compiler above is used |
| 712 | # for building intermediate code-generator tools. |
| 713 | # |
| 714 | TCC = $(PREFIX)$(TCCEXE) -Wall |
| 715 | |
| 716 | #### Add the necessary command line options to build with debugging |
| 717 | # symbols, if enabled. |
| 718 | # |
| 719 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 720 |
+20
-4
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -32,17 +32,25 @@ | ||
| 32 | 32 | SRCDIR = src |
| 33 | 33 | |
| 34 | 34 | #### The directory into which object code files should be written. |
| 35 | 35 | # |
| 36 | 36 | OBJDIR = wbld |
| 37 | + | |
| 38 | +#### C compiler for use in building executables that will run on | |
| 39 | +# the platform that is doing the build. This is used to compile | |
| 40 | +# code-generator programs as part of the build process. See TCC | |
| 41 | +# and TCCEXE below for the C compiler for building the finished | |
| 42 | +# binary. | |
| 43 | +# | |
| 44 | +BCCEXE = gcc | |
| 37 | 45 | |
| 38 | 46 | #### C Compiler and options for use in building executables that |
| 39 | 47 | # will run on the platform that is doing the build. This is used |
| 40 | 48 | # to compile code-generator programs as part of the build process. |
| 41 | 49 | # See TCC below for the C compiler for building the finished binary. |
| 42 | 50 | # |
| 43 | -BCC = gcc | |
| 51 | +BCC = $(BCCEXE) | |
| 44 | 52 | |
| 45 | 53 | #### Enable compiling with debug symbols (much larger binary) |
| 46 | 54 | # |
| 47 | 55 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 48 | 56 | |
| @@ -203,17 +211,25 @@ | ||
| 203 | 211 | else |
| 204 | 212 | LIBTCL = -ltcl86 |
| 205 | 213 | TCLTARGET = binaries |
| 206 | 214 | endif |
| 207 | 215 | |
| 208 | -#### C Compile and options for use in building executables that | |
| 209 | -# will run on the target platform. This is usually the same | |
| 216 | +#### C compiler for use in building executables that will run on the | |
| 217 | +# target platform. This is usually the same as BCCEXE, unless you | |
| 218 | +# are cross-compiling. This C compiler builds the finished binary | |
| 219 | +# for fossil. See BCC and BCCEXE above for the C compiler for | |
| 220 | +# building intermediate code-generator tools. | |
| 221 | +# | |
| 222 | +TCCEXE = gcc | |
| 223 | + | |
| 224 | +#### C compiler and options for use in building executables that will | |
| 225 | +# run on the target platform. This is usually the almost the same | |
| 210 | 226 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 211 | 227 | # the finished binary for fossil. The BCC compiler above is used |
| 212 | 228 | # for building intermediate code-generator tools. |
| 213 | 229 | # |
| 214 | -TCC = $(PREFIX)gcc -Wall | |
| 230 | +TCC = $(PREFIX)$(TCCEXE) -Wall | |
| 215 | 231 | |
| 216 | 232 | #### Add the necessary command line options to build with debugging |
| 217 | 233 | # symbols, if enabled. |
| 218 | 234 | # |
| 219 | 235 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 220 | 236 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -32,17 +32,25 @@ | |
| 32 | SRCDIR = src |
| 33 | |
| 34 | #### The directory into which object code files should be written. |
| 35 | # |
| 36 | OBJDIR = wbld |
| 37 | |
| 38 | #### C Compiler and options for use in building executables that |
| 39 | # will run on the platform that is doing the build. This is used |
| 40 | # to compile code-generator programs as part of the build process. |
| 41 | # See TCC below for the C compiler for building the finished binary. |
| 42 | # |
| 43 | BCC = gcc |
| 44 | |
| 45 | #### Enable compiling with debug symbols (much larger binary) |
| 46 | # |
| 47 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 48 | |
| @@ -203,17 +211,25 @@ | |
| 203 | else |
| 204 | LIBTCL = -ltcl86 |
| 205 | TCLTARGET = binaries |
| 206 | endif |
| 207 | |
| 208 | #### C Compile and options for use in building executables that |
| 209 | # will run on the target platform. This is usually the same |
| 210 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 211 | # the finished binary for fossil. The BCC compiler above is used |
| 212 | # for building intermediate code-generator tools. |
| 213 | # |
| 214 | TCC = $(PREFIX)gcc -Wall |
| 215 | |
| 216 | #### Add the necessary command line options to build with debugging |
| 217 | # symbols, if enabled. |
| 218 | # |
| 219 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 220 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -32,17 +32,25 @@ | |
| 32 | SRCDIR = src |
| 33 | |
| 34 | #### The directory into which object code files should be written. |
| 35 | # |
| 36 | OBJDIR = wbld |
| 37 | |
| 38 | #### C compiler for use in building executables that will run on |
| 39 | # the platform that is doing the build. This is used to compile |
| 40 | # code-generator programs as part of the build process. See TCC |
| 41 | # and TCCEXE below for the C compiler for building the finished |
| 42 | # binary. |
| 43 | # |
| 44 | BCCEXE = gcc |
| 45 | |
| 46 | #### C Compiler and options for use in building executables that |
| 47 | # will run on the platform that is doing the build. This is used |
| 48 | # to compile code-generator programs as part of the build process. |
| 49 | # See TCC below for the C compiler for building the finished binary. |
| 50 | # |
| 51 | BCC = $(BCCEXE) |
| 52 | |
| 53 | #### Enable compiling with debug symbols (much larger binary) |
| 54 | # |
| 55 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 56 | |
| @@ -203,17 +211,25 @@ | |
| 211 | else |
| 212 | LIBTCL = -ltcl86 |
| 213 | TCLTARGET = binaries |
| 214 | endif |
| 215 | |
| 216 | #### C compiler for use in building executables that will run on the |
| 217 | # target platform. This is usually the same as BCCEXE, unless you |
| 218 | # are cross-compiling. This C compiler builds the finished binary |
| 219 | # for fossil. See BCC and BCCEXE above for the C compiler for |
| 220 | # building intermediate code-generator tools. |
| 221 | # |
| 222 | TCCEXE = gcc |
| 223 | |
| 224 | #### C compiler and options for use in building executables that will |
| 225 | # run on the target platform. This is usually the almost the same |
| 226 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 227 | # the finished binary for fossil. The BCC compiler above is used |
| 228 | # for building intermediate code-generator tools. |
| 229 | # |
| 230 | TCC = $(PREFIX)$(TCCEXE) -Wall |
| 231 | |
| 232 | #### Add the necessary command line options to build with debugging |
| 233 | # symbols, if enabled. |
| 234 | # |
| 235 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 236 |
+20
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -32,17 +32,25 @@ | ||
| 32 | 32 | SRCDIR = src |
| 33 | 33 | |
| 34 | 34 | #### The directory into which object code files should be written. |
| 35 | 35 | # |
| 36 | 36 | OBJDIR = wbld |
| 37 | + | |
| 38 | +#### C compiler for use in building executables that will run on | |
| 39 | +# the platform that is doing the build. This is used to compile | |
| 40 | +# code-generator programs as part of the build process. See TCC | |
| 41 | +# and TCCEXE below for the C compiler for building the finished | |
| 42 | +# binary. | |
| 43 | +# | |
| 44 | +BCCEXE = gcc | |
| 37 | 45 | |
| 38 | 46 | #### C Compiler and options for use in building executables that |
| 39 | 47 | # will run on the platform that is doing the build. This is used |
| 40 | 48 | # to compile code-generator programs as part of the build process. |
| 41 | 49 | # See TCC below for the C compiler for building the finished binary. |
| 42 | 50 | # |
| 43 | -BCC = gcc | |
| 51 | +BCC = $(BCCEXE) | |
| 44 | 52 | |
| 45 | 53 | #### Enable compiling with debug symbols (much larger binary) |
| 46 | 54 | # |
| 47 | 55 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 48 | 56 | |
| @@ -203,17 +211,25 @@ | ||
| 203 | 211 | else |
| 204 | 212 | LIBTCL = -ltcl86 |
| 205 | 213 | TCLTARGET = binaries |
| 206 | 214 | endif |
| 207 | 215 | |
| 208 | -#### C Compile and options for use in building executables that | |
| 209 | -# will run on the target platform. This is usually the same | |
| 216 | +#### C compiler for use in building executables that will run on the | |
| 217 | +# target platform. This is usually the same as BCCEXE, unless you | |
| 218 | +# are cross-compiling. This C compiler builds the finished binary | |
| 219 | +# for fossil. See BCC and BCCEXE above for the C compiler for | |
| 220 | +# building intermediate code-generator tools. | |
| 221 | +# | |
| 222 | +TCCEXE = gcc | |
| 223 | + | |
| 224 | +#### C compiler and options for use in building executables that will | |
| 225 | +# run on the target platform. This is usually the almost the same | |
| 210 | 226 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 211 | 227 | # the finished binary for fossil. The BCC compiler above is used |
| 212 | 228 | # for building intermediate code-generator tools. |
| 213 | 229 | # |
| 214 | -TCC = $(PREFIX)gcc -Wall | |
| 230 | +TCC = $(PREFIX)$(TCCEXE) -Wall | |
| 215 | 231 | |
| 216 | 232 | #### Add the necessary command line options to build with debugging |
| 217 | 233 | # symbols, if enabled. |
| 218 | 234 | # |
| 219 | 235 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 220 | 236 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -32,17 +32,25 @@ | |
| 32 | SRCDIR = src |
| 33 | |
| 34 | #### The directory into which object code files should be written. |
| 35 | # |
| 36 | OBJDIR = wbld |
| 37 | |
| 38 | #### C Compiler and options for use in building executables that |
| 39 | # will run on the platform that is doing the build. This is used |
| 40 | # to compile code-generator programs as part of the build process. |
| 41 | # See TCC below for the C compiler for building the finished binary. |
| 42 | # |
| 43 | BCC = gcc |
| 44 | |
| 45 | #### Enable compiling with debug symbols (much larger binary) |
| 46 | # |
| 47 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 48 | |
| @@ -203,17 +211,25 @@ | |
| 203 | else |
| 204 | LIBTCL = -ltcl86 |
| 205 | TCLTARGET = binaries |
| 206 | endif |
| 207 | |
| 208 | #### C Compile and options for use in building executables that |
| 209 | # will run on the target platform. This is usually the same |
| 210 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 211 | # the finished binary for fossil. The BCC compiler above is used |
| 212 | # for building intermediate code-generator tools. |
| 213 | # |
| 214 | TCC = $(PREFIX)gcc -Wall |
| 215 | |
| 216 | #### Add the necessary command line options to build with debugging |
| 217 | # symbols, if enabled. |
| 218 | # |
| 219 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 220 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -32,17 +32,25 @@ | |
| 32 | SRCDIR = src |
| 33 | |
| 34 | #### The directory into which object code files should be written. |
| 35 | # |
| 36 | OBJDIR = wbld |
| 37 | |
| 38 | #### C compiler for use in building executables that will run on |
| 39 | # the platform that is doing the build. This is used to compile |
| 40 | # code-generator programs as part of the build process. See TCC |
| 41 | # and TCCEXE below for the C compiler for building the finished |
| 42 | # binary. |
| 43 | # |
| 44 | BCCEXE = gcc |
| 45 | |
| 46 | #### C Compiler and options for use in building executables that |
| 47 | # will run on the platform that is doing the build. This is used |
| 48 | # to compile code-generator programs as part of the build process. |
| 49 | # See TCC below for the C compiler for building the finished binary. |
| 50 | # |
| 51 | BCC = $(BCCEXE) |
| 52 | |
| 53 | #### Enable compiling with debug symbols (much larger binary) |
| 54 | # |
| 55 | # FOSSIL_ENABLE_SYMBOLS = 1 |
| 56 | |
| @@ -203,17 +211,25 @@ | |
| 211 | else |
| 212 | LIBTCL = -ltcl86 |
| 213 | TCLTARGET = binaries |
| 214 | endif |
| 215 | |
| 216 | #### C compiler for use in building executables that will run on the |
| 217 | # target platform. This is usually the same as BCCEXE, unless you |
| 218 | # are cross-compiling. This C compiler builds the finished binary |
| 219 | # for fossil. See BCC and BCCEXE above for the C compiler for |
| 220 | # building intermediate code-generator tools. |
| 221 | # |
| 222 | TCCEXE = gcc |
| 223 | |
| 224 | #### C compiler and options for use in building executables that will |
| 225 | # run on the target platform. This is usually the almost the same |
| 226 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 227 | # the finished binary for fossil. The BCC compiler above is used |
| 228 | # for building intermediate code-generator tools. |
| 229 | # |
| 230 | TCC = $(PREFIX)$(TCCEXE) -Wall |
| 231 | |
| 232 | #### Add the necessary command line options to build with debugging |
| 233 | # symbols, if enabled. |
| 234 | # |
| 235 | ifdef FOSSIL_ENABLE_SYMBOLS |
| 236 |