cygwin: add as a cross-compilation target, and get bash.exe to compile #354137
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| lib, | ||
| stdenv, | ||
| fetchgit, | ||
| bison, | ||
| }: | ||
| stdenv.mkDerivation { | ||
| pname = "cocom"; | ||
| version = "0.996"; | ||
|
|
||
| src = fetchgit { | ||
| url = "https://git.code.sf.net/p/cocom/git"; | ||
| sha256 = "sha256-utLafkznMC4LrZgF6vKehtIGMwNMwLP9M9Nwu/RyWio="; | ||
| rev = "64ee80224aa13f9944d439f3f90862ca76158705"; | ||
| }; | ||
|
|
||
|
|
||
| nativeBuildInputs = [ bison ]; | ||
|
|
||
| patches = [ ./remove-lto.patch ]; | ||
|
There was a problem hiding this comment. This could do with some explanation, ideally in the patch file. |
||
|
|
||
| meta = { | ||
| description = "Tool set oriented towards the creation of compilers"; | ||
| homepage = "https://cocom.sourceforge.net/"; | ||
| license = lib.licenses.gpl2Plus; | ||
| maintainers = with lib.maintainers; [ puffnfresh ]; | ||
| platforms = lib.platforms.linux; | ||
| }; | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| diff --git a/configure b/configure | ||
| index 574cbe9..0dc2aa0 100755 | ||
| --- a/configure | ||
| +++ b/configure | ||
| @@ -5858,37 +5858,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
| CXXFLAGS="`echo $CXXFLAGS|sed s/-O2//` -O3" | ||
| fi | ||
|
|
||
| - my_save_cflags="$CFLAGS" | ||
| - CFLAGS=-flto | ||
| - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether CC supports -flto" >&5 | ||
| -$as_echo_n "checking whether CC supports -flto... " >&6; } | ||
| - cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| -/* end confdefs.h. */ | ||
| - | ||
| -int | ||
| -main () | ||
| -{ | ||
| - | ||
| - ; | ||
| - return 0; | ||
| -} | ||
| -_ACEOF | ||
| -if ac_fn_c_try_compile "$LINENO"; then : | ||
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
| -$as_echo "yes" >&6; } | ||
| - lto=yes | ||
| -else | ||
| - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
| -$as_echo "no" >&6; } | ||
| - | ||
| -fi | ||
| -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
| - CFLAGS="$my_save_cflags" | ||
| - if test "$lto" = yes; then | ||
| - CFLAGS="`echo $CFLAGS` -flto" | ||
| - CXXFLAGS="`echo $CXXFLAGS` -flto" | ||
| - fi | ||
| - | ||
| system=`uname -m` | ||
| case $system in | ||
| i386*|i486*|i586*|i686*) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| --- winsup/configure.old 2024-11-01 22:38:21.005768397 +1100 | ||
| +++ winsup/configure 2024-11-01 22:39:33.247435255 +1100 | ||
| @@ -3970,155 +3970,6 @@ | ||
| _ACEOF | ||
| ac_clean_files_save=$ac_clean_files | ||
| ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" | ||
| -# Try to create an executable without -o first, disregard a.out. | ||
| -# It will help us diagnose broken compilers, and finding out an intuition | ||
| -# of exeext. | ||
| -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 | ||
| -printf %s "checking whether the C compiler works... " >&6; } | ||
| -ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` | ||
| - | ||
| -# The possible output files: | ||
| -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" | ||
| - | ||
| -ac_rmfiles= | ||
| -for ac_file in $ac_files | ||
| -do | ||
| - case $ac_file in | ||
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; | ||
| - * ) ac_rmfiles="$ac_rmfiles $ac_file";; | ||
| - esac | ||
| -done | ||
| -rm -f $ac_rmfiles | ||
| - | ||
| -if { { ac_try="$ac_link_default" | ||
| -case "(($ac_try" in | ||
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
| - *) ac_try_echo=$ac_try;; | ||
| -esac | ||
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
| -printf "%s\n" "$ac_try_echo"; } >&5 | ||
| - (eval "$ac_link_default") 2>&5 | ||
| - ac_status=$? | ||
| - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
| - test $ac_status = 0; } | ||
| -then : | ||
| - # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'. | ||
| -# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no' | ||
| -# in a Makefile. We should not override ac_cv_exeext if it was cached, | ||
| -# so that the user can short-circuit this test for compilers unknown to | ||
| -# Autoconf. | ||
| -for ac_file in $ac_files '' | ||
| -do | ||
| - test -f "$ac_file" || continue | ||
| - case $ac_file in | ||
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) | ||
| - ;; | ||
| - [ab].out ) | ||
| - # We found the default executable, but exeext='' is most | ||
| - # certainly right. | ||
| - break;; | ||
| - *.* ) | ||
| - if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; | ||
| - then :; else | ||
| - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
| - fi | ||
| - # We set ac_cv_exeext here because the later test for it is not | ||
| - # safe: cross compilers may not add the suffix if given an '-o' | ||
| - # argument, so we may need to know it at that point already. | ||
| - # Even if this section looks crufty: it has the advantage of | ||
| - # actually working. | ||
| - break;; | ||
| - * ) | ||
| - break;; | ||
| - esac | ||
| -done | ||
| -test "$ac_cv_exeext" = no && ac_cv_exeext= | ||
| - | ||
| -else case e in #( | ||
| - e) ac_file='' ;; | ||
| -esac | ||
| -fi | ||
| -if test -z "$ac_file" | ||
| -then : | ||
| - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
| -printf "%s\n" "no" >&6; } | ||
| -printf "%s\n" "$as_me: failed program was:" >&5 | ||
| -sed 's/^/| /' conftest.$ac_ext >&5 | ||
| - | ||
| -{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 | ||
| -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} | ||
| -as_fn_error 77 "C compiler cannot create executables | ||
| -See 'config.log' for more details" "$LINENO" 5; } | ||
| -else case e in #( | ||
| - e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
| -printf "%s\n" "yes" >&6; } ;; | ||
| -esac | ||
| -fi | ||
| -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 | ||
| -printf %s "checking for C compiler default output file name... " >&6; } | ||
| -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 | ||
| -printf "%s\n" "$ac_file" >&6; } | ||
| -ac_exeext=$ac_cv_exeext | ||
| - | ||
| -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out | ||
| -ac_clean_files=$ac_clean_files_save | ||
| -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 | ||
| -printf %s "checking for suffix of executables... " >&6; } | ||
| -if { { ac_try="$ac_link" | ||
| -case "(($ac_try" in | ||
| - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
| - *) ac_try_echo=$ac_try;; | ||
| -esac | ||
| -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" | ||
| -printf "%s\n" "$ac_try_echo"; } >&5 | ||
| - (eval "$ac_link") 2>&5 | ||
| - ac_status=$? | ||
| - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
| - test $ac_status = 0; } | ||
| -then : | ||
| - # If both 'conftest.exe' and 'conftest' are 'present' (well, observable) | ||
| -# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will | ||
| -# work properly (i.e., refer to 'conftest.exe'), while it won't with | ||
| -# 'rm'. | ||
| -for ac_file in conftest.exe conftest conftest.*; do | ||
| - test -f "$ac_file" || continue | ||
| - case $ac_file in | ||
| - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; | ||
| - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` | ||
| - break;; | ||
| - * ) break;; | ||
| - esac | ||
| -done | ||
| -else case e in #( | ||
| - e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5 | ||
| -printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;} | ||
| -as_fn_error $? "cannot compute suffix of executables: cannot compile and link | ||
| -See 'config.log' for more details" "$LINENO" 5; } ;; | ||
| -esac | ||
| -fi | ||
| -rm -f conftest conftest$ac_cv_exeext | ||
| -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 | ||
| -printf "%s\n" "$ac_cv_exeext" >&6; } | ||
| - | ||
| -rm -f conftest.$ac_ext | ||
| -EXEEXT=$ac_cv_exeext | ||
| -ac_exeext=$EXEEXT | ||
| -cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
| -/* end confdefs.h. */ | ||
| -#include <stdio.h> | ||
| -int | ||
| -main (void) | ||
| -{ | ||
| -FILE *f = fopen ("conftest.out", "w"); | ||
| - if (!f) | ||
| - return 1; | ||
| - return ferror (f) || fclose (f) != 0; | ||
| - | ||
| - ; | ||
| - return 0; | ||
| -} | ||
| -_ACEOF | ||
| -ac_clean_files="$ac_clean_files conftest.out" | ||
| # Check that the compiler produces executables we can run. If not, either | ||
| # the compiler is broken, or we cross compile. | ||
| { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change is purely a matter of style, not behavior, right?
(I kinda wonder if we can just drop this case, as the older cygwin stuff is bit-rotted for years at this point.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm in favour of getting rid of all the older Cygwin support, since it just doesn't work anymore (I tried).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it's well over a decade old
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a go at removing the hack altogether: puffnfresh@16e9e8b
It feels a little bit wrong to add Cygwin as a "kernel" but it does seem to work. Let me know what you think.