diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-11-08 17:54:25 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-11-08 18:11:24 +0000 |
| commit | f647fd53a9cfe8e6de07f334c9c024365c8181a4 (patch) | |
| tree | cdcd50399718d45ccf9ad41942bef717d8f6b0b0 /libffi | |
| parent | efcbe14df849dc1acc810253f4e0c725bb2d7a12 (diff) | |
| download | haskell-f647fd53a9cfe8e6de07f334c9c024365c8181a4.tar.gz | |
Fix the libffi ln handling on cygwin
iWe were adding c:/... to $PATH, but : is the separator
in $PATH.
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ghc.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index a693bcb44e..48c71bc8ce 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -34,6 +34,10 @@ endif libffi_STATIC_LIB = libffi/build/inst/lib/libffi.a ffi_HEADER = rts/dist/build/ffi.h +ifeq "$(OSTYPE)" "cygwin" +LIBFFI_PATH_MANGLE = PATH=$$(cygpath "$(TOP)")/libffi:$$PATH; export PATH; +endif + ifneq "$(BINDIST)" "YES" $(libffi_STAMP_CONFIGURE): "$(RM)" $(RM_OPTS) $(libffi_STAMP_STATIC_CONFIGURE) @@ -54,8 +58,7 @@ $(libffi_STAMP_CONFIGURE): # 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 cd libffi && \ - PATH=$(TOP)/libffi:$$PATH; \ - export PATH; \ + $(LIBFFI_PATH_MANGLE) \ cd build && \ CC=$(CC_STAGE1) \ LD=$(LD) \ |