mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

let's not -DOSX, that results in unwanted mangling

Browse source
This commit is contained in:
Joey Hess 2012-09-29 14:49:15 -04:00
parent 6ef547717c
commit 0ccfb3bbb2
5 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Assistant/WebApp/DashBoard.hs
View file

@ -142,7 +142,7 @@ openFileBrowser = do
return False return False
) )
where where
#if OSX #ifdef darwin_HOST_OS
cmd = "open" cmd = "open"
#else #else
cmd = "xdg-open" cmd = "xdg-open"

2
Makefile
View file

@ -23,7 +23,7 @@ else
OPTFLAGS=-DWITH_KQUEUE OPTFLAGS=-DWITH_KQUEUE
clibs=Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o clibs=Utility/libdiskfree.o Utility/libmounts.o Utility/libkqueue.o
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
OPTFLAGS=-DWITH_KQUEUE -DOSX OPTFLAGS=-DWITH_KQUEUE
# Ensure OSX compiler builds for 32 bit when using 32 bit ghc # Ensure OSX compiler builds for 32 bit when using 32 bit ghc
GHCARCH:=$(shell ghc -e 'print System.Info.arch') GHCARCH:=$(shell ghc -e 'print System.Info.arch')
ifeq ($(GHCARCH),i386) ifeq ($(GHCARCH),i386)

2
Utility/WebApp.hs
View file

@ -44,7 +44,7 @@ localhost = "localhost"
runBrowser :: String -> IO Bool runBrowser :: String -> IO Bool
runBrowser url = boolSystem cmd [Param url] runBrowser url = boolSystem cmd [Param url]
where where
#if OSX #ifdef darwin_HOST_OS
cmd = "open" cmd = "open"
#else #else
cmd = "xdg-open" cmd = "xdg-open"

2
doc/bugs/build_is_broken_at_commit_cc0e5b7.mdwn
View file

@ -9,3 +9,5 @@ make: *** [git-annex] Error 1
</pre> </pre>
This was first introduced at commit e88e3ba This was first introduced at commit e88e3ba
> oops, -DOSX is not a good idea. [[done]] --[[Joey]]

3
git-annex.cabal
View file

@ -89,9 +89,6 @@ Executable git-annex
Build-Depends: network-multicast, network-info Build-Depends: network-multicast, network-info
CPP-Options: -DWITH_PAIRING CPP-Options: -DWITH_PAIRING
if os(darwin)
CPP-Options: -DOSX
Test-Suite test Test-Suite test
Type: exitcode-stdio-1.0 Type: exitcode-stdio-1.0
Main-Is: test.hs Main-Is: test.hs