diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-02-14 22:04:50 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-02-14 22:04:50 +0000 |
| commit | a0c8fa4159e95be94474dd18b21e6c5fc35362ae (patch) | |
| tree | 80b1b7623e54268ab35b0044f8b77d8b63c937f0 | |
| parent | ca10c79f28cfc0c29d02d0f2c0ea111093bd2b37 (diff) | |
| download | haskell-a0c8fa4159e95be94474dd18b21e6c5fc35362ae.tar.gz | |
Don't rely on tar supporting -z; trac #3841
| -rw-r--r-- | libffi/ghc.mk | 2 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libffi/ghc.mk b/libffi/ghc.mk index 1216a3238f..17a86eeca2 100644 --- a/libffi/ghc.mk +++ b/libffi/ghc.mk @@ -113,7 +113,7 @@ endif ifneq "$(BINDIST)" "YES" $(libffi_STAMP_CONFIGURE): "$(RM)" $(RM_OPTS) -r $(LIBFFI_DIR) libffi/build - cd libffi && $(TAR) -zxf ../ghc-tarballs/libffi/libffi*.tar.gz + cat ghc-tarballs/libffi/libffi*.tar.gz | $(GZIP) -d | { cd libffi && $(TAR) -xf - ; } mv libffi/libffi-* libffi/build chmod +x libffi/ln cd libffi/build && "$(PATCH)" -p1 < ../libffi.dllize-3.0.8.patch diff --git a/mk/config.mk.in b/mk/config.mk.in index ea3c1ffdbe..1c59048e9f 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -652,6 +652,8 @@ SIZE = size STRIP = strip PATCH = @PatchCmd@ TAR = @TarCmd@ +BZIP2 = bzip2 +GZIP = gzip ZIP = zip HSCOLOUR = @HSCOLOUR@ |