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

allow OPTFLAGS to be overridden

Browse source
This commit is contained in:
Joey Hess 2012-10-14 20:32:27 -04:00
parent c504f4025f
commit 979f9cd966
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -16,13 +16,13 @@ all=$(bins) $(mans) docs
OS:=$(shell uname | sed 's/[-_].*//') OS:=$(shell uname | sed 's/[-_].*//')
ifeq ($(OS),Linux) ifeq ($(OS),Linux)
OPTFLAGS=-DWITH_INOTIFY -DWITH_DBUS OPTFLAGS?=-DWITH_INOTIFY -DWITH_DBUS
clibs=Utility/libdiskfree.o Utility/libmounts.o clibs=Utility/libdiskfree.o Utility/libmounts.o
THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi) THREADFLAGS=$(shell if test -e `ghc --print-libdir`/libHSrts_thr.a; then printf -- -threaded; fi)
else else
# BSD system # BSD system
THREADFLAGS=-threaded THREADFLAGS=-threaded
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)
# Ensure OSX compiler builds for 32 bit when using 32 bit ghc # Ensure OSX compiler builds for 32 bit when using 32 bit ghc