Skip to content

Commit 8416bec

Browse files
committed
Remove NEED_setSymbolicLinkOwnerAndGroup
Alternative solution to building. This allows us to remove the include of HsUnixCompat.
1 parent c38e4c8 commit 8416bec

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

include/HsUnixCompat.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,3 @@
44
unsigned int unix_major(dev_t dev);
55
unsigned int unix_minor(dev_t dev);
66
dev_t unix_makedev(unsigned int maj, unsigned int min);
7-
8-
#define NEED_setSymbolicLinkOwnerAndGroup !HAVE_LCHOWN

src/System/PosixCompat/Files.hsc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ module System.PosixCompat.Files (
106106

107107
#ifndef mingw32_HOST_OS
108108

109-
#include "HsUnixCompat.h"
109+
#include "HsUnixConfig.h"
110110

111111
import System.Posix.Files
112112

113-
#if NEED_setSymbolicLinkOwnerAndGroup
113+
#if !HAVE_LCHOWN
114114
import System.PosixCompat.Types
115115

116116
setSymbolicLinkOwnerAndGroup :: FilePath -> UserID -> GroupID -> IO ()

unix-compat.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ Library
6969

7070
else
7171
build-depends: unix >= 2.7.2.0 && < 2.9
72-
include-dirs: include
73-
includes: HsUnixCompat.h
74-
install-includes: HsUnixCompat.h
7572
if !arch(wasm32)
76-
c-sources: cbits/HsUnixCompat.c
73+
include-dirs: include
74+
includes: HsUnixCompat.h
75+
install-includes: HsUnixCompat.h
76+
c-sources: cbits/HsUnixCompat.c
7777
if os(solaris)
7878
cc-options: -DSOLARIS
7979

0 commit comments

Comments
 (0)