diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-15 11:36:44 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-20 12:35:52 +0200 |
| commit | b6be81b841e34ca45b3549c4c79e886a8761e59a (patch) | |
| tree | d90ff31ecf839f756268a715abe97bf5d6797e17 /libffi | |
| parent | d97e60f5dfab102127b6fa4a5277084815136fc7 (diff) | |
| download | haskell-b6be81b841e34ca45b3549c4c79e886a8761e59a.tar.gz | |
Build system: delete half-baked Cygwin support
We only support building GHC on mys2 nowadays, see
https://ghc.haskell.org/trac/ghc/wiki/Building/Preparation/Windows.
This (partially) reverts various commits from a few years ago, among which:
* 5775d5142da227d65fb86994d363eb16841ee642
"Add OSTYPE build-system variable, and use it"
* 3fb8c431824aa2f3bd979e35d1a283546fcfbe74
"Fix building libgmp on cygwin"
* cdbb4720c424500adb57cbbef69721d0b039fa46
"Fix cmd invocation by libffi cuild system on Windows 7 cygwin"
* e8121501ee3549a35e954726ccfd871ac9d51f83
"Fix dblatex and xml* tool detection on Windows"
Reviewed by: austin, Phyx
Differential Revision: https://phabricator.haskell.org/D1155
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 59e089d88e..a37e3becfd 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -42,10 +42,6 @@ LIBFFI_NAME = ffi endif LIBFFI_DLL = lib$(LIBFFI_NAME).dll -ifeq "$(OSTYPE)" "cygwin" -LIBFFI_PATH_MANGLE = PATH=$$(cygpath "$(TOP)")/libffi:$$PATH; export PATH; -endif - ifneq "$(BINDIST)" "YES" $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP) $(call removeFiles,$(libffi_STAMP_STATIC_CONFIGURE)) @@ -83,18 +79,12 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP) mv libffi/build/Makefile.in libffi/build/Makefile.in.orig sed 's:@toolexeclibdir@:$$(libdir):g' < libffi/build/Makefile.in.orig > libffi/build/Makefile.in - # Their cmd invocation only works on msys. On cygwin it starts - # a cmd interactive shell. The replacement works in both environments. - mv libffi/build/ltmain.sh libffi/build/ltmain.sh.orig - sed 's#cmd //c echo "\$$1"#cmd /c "echo $$1"#' < libffi/build/ltmain.sh.orig > libffi/build/ltmain.sh - # * Because -Werror may be in SRC_CC_OPTS/SRC_LD_OPTS, we need to turn # warnings off or the compilation of libffi might fail due to warnings; # hence the -w flags. # * We specify --libdir, as we need to know the path to libffi.a, but on # some platforms it defaults to .../lib64/ rather than .../lib/. cd libffi && \ - $(LIBFFI_PATH_MANGLE) \ cd build && \ CC=$(CC_STAGE1) \ CXX=$(CC_STAGE1) \ |