summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--Utility/WebApp.hs2
-rw-r--r--doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn2
-rw-r--r--git-annex.cabal3
4 files changed, 4 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 10fdd76b1..8b7e82554 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ else
OPTFLAGS=-DWITH_KQUEUE
clibs=Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o
ifeq ($(OS),Darwin)
-OPTFLAGS=-DWITH_KQUEUE -DOSX
+OPTFLAGS=-DWITH_KQUEUE
# Ensure OSX compiler builds for 32 bit when using 32 bit ghc
GHCARCH:=$(shell ghc -e 'print System.Info.arch')
ifeq ($(GHCARCH),i386)
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs
index 3a55bd74a..e11b3f411 100644
--- a/Utility/WebApp.hs
+++ b/Utility/WebApp.hs
@@ -44,7 +44,7 @@ localhost = "localhost"
runBrowser :: String -> IO Bool
runBrowser url = boolSystem cmd [Param url]
where
-#if OSX
+#ifdef darwin_HOST_OS
cmd = "open"
#else
cmd = "xdg-open"
diff --git a/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn b/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
index da7c9bed1..43074915f 100644
--- a/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
+++ b/doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
@@ -9,3 +9,5 @@ make: *** [git-annex] Error 1
</pre>
This was first introduced at commit e88e3ba
+
+> oops, -DOSX is not a good idea. [[done]] --[[Joey]]
diff --git a/git-annex.cabal b/git-annex.cabal
index a02505c5f..1ac97ae38 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -89,9 +89,6 @@ Executable git-annex
Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_PAIRING
- if os(darwin)
- CPP-Options: -DOSX
-
Test-Suite test
Type: exitcode-stdio-1.0
Main-Is: test.hs