From add62721b9a4bd3daaf352d8ceb1d27d254ef9e2 Mon Sep 17 00:00:00 2001
From: ijones <ijones@syntaxpolice.org>
Date: Sat, 28 Aug 2004 21:46:05 +0000
Subject: [PATCH] tried to fix file permissions bug some more
---
Distribution/Simple/Utils.hs | 8 --------
Makefile | 5 ++++-
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Distribution/Simple/Utils.hs b/Distribution/Simple/Utils.hs
index 728b4662f4..f1c30fc5f1 100644
--- a/Distribution/Simple/Utils.hs
+++ b/Distribution/Simple/Utils.hs
@@ -91,9 +91,7 @@ import Compat.Exception (bracket)
import System.Environment
import System.Directory
import Foreign.Marshal (allocaBytes)
-#ifndef mingw32_TARGET_OS
import System.Posix.Files (getFileStatus, accessTime, modificationTime, setFileTimes, fileMode, setFileMode)
-#endif
#ifdef DEBUG
import HUnit ((~:), (~=?), Test(..), assertEqual)
@@ -387,15 +385,9 @@ pathJoin :: [String] -> FilePath
pathJoin = concat . intersperse pathSeparatorStr
-copyPermissions :: FilePath -> FilePath -> IO ()
-#ifndef mingw32_TARGET_OS
copyPermissions src dest
= do srcStatus <- getFileStatus src
setFileMode dest (fileMode srcStatus)
-#else
-copyPermissions src dest
- = return ()
-#endif
copyFileTimes :: FilePath -> FilePath -> IO ()
#ifndef mingw32_TARGET_OS
diff --git a/Makefile b/Makefile
index e5f3f8d742..2c31a1efa5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ PREF=/usr/local
USER_FLAG =
GHCPKGFLAGS =
+# Comment out this line if your system doesn't have System.Posix.
+ISPOSIX=-DHAVE_UNIX_PACKAGE
+
ifdef user
USER_FLAG = --user
GHCPKGFLAGS = -f ~/.ghc-packages
@@ -99,7 +102,7 @@ hunitInstall-stamp: hunit-stamp
moduleTest:
mkdir -p dist/debug
- ghc $(GHCFLAGS) -DDEBUG -odir dist/debug -hidir dist/debug -idist/debug/:.:test/HUnit-1.0/src Distribution/ModuleTest -o moduleTest
+ ghc $(GHCFLAGS) $(ISPOSIX) -DDEBUG -odir dist/debug -hidir dist/debug -idist/debug/:.:test/HUnit-1.0/src Distribution/ModuleTest -o moduleTest
tests: moduleTest clean
cd test/A && make clean
--
GitLab