diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus <Jimmy@web> | 2012-06-18 08:24:24 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2012-06-18 08:24:24 +0000 |
| commit | 123df55d614c55d48b14b8152dd14d1548bf00d6 (patch) | |
| tree | 7a76fabdd0a6f303e91ebc9b533f41f5c8817bb2 | |
| parent | 66344a3613cf12720585f9afa98d2422b699b9c8 (diff) | |
| -rw-r--r-- | doc/bugs/fix_for_makefile_to_check_if_OS_is_linux_or_not___40__relates_to_the_new_inotify_flag__41__.mdwn | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/doc/bugs/fix_for_makefile_to_check_if_OS_is_linux_or_not___40__relates_to_the_new_inotify_flag__41__.mdwn b/doc/bugs/fix_for_makefile_to_check_if_OS_is_linux_or_not___40__relates_to_the_new_inotify_flag__41__.mdwn new file mode 100644 index 000000000..9805478f5 --- /dev/null +++ b/doc/bugs/fix_for_makefile_to_check_if_OS_is_linux_or_not___40__relates_to_the_new_inotify_flag__41__.mdwn @@ -0,0 +1,34 @@ +Since the watch branch is now merged into master, it doesn't quite build cleanly on non-linux systems anymore. So here's a small change to the Makefile to work around the problem for now. + +<pre> +From 707cb47744775c324060febe11987db5f10ed9ff Mon Sep 17 00:00:00 2001 +From: Jimmy Tang <jtang@tchpc.tcd.ie> +Date: Mon, 18 Jun 2012 09:20:35 +0100 +Subject: [PATCH] Teach _Makefile_ to only do _-DWITH_INOTIFY_ when on a Linux + machine. + +--- + Makefile | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 6d36e8b..8884b5c 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,12 @@ ++OS:=$(shell uname | sed 's/[-_].*//') ++ ++ifeq ($(OS),Linux) ++BASEFLAGS_OPTS+=-DWITH_INOTIFY ++endif ++ + PREFIX=/usr + IGNORE=-ignore-package monads-fd -ignore-package monads-tf +-BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 -DWITH_INOTIFY ++BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3 $(BASEFLAGS_OPTS) + GHCFLAGS=-O2 $(BASEFLAGS) + + ifdef PROFILE +-- +1.7.10.4 +</pre> |