From 0fc3078a039e7fdd16baf3537a534462d3023db1 Mon Sep 17 00:00:00 2001 From: Matthias Kilian Date: Wed, 26 Aug 2009 15:33:40 +0000 Subject: [PATCH] Don't mess up absolute INCLUDE_DIRS When there are some absolute include dirs, don't create arguments like -Ilibraries/base//usr/local/include. I need this fix for injecting the iconv include dir (which is /usr/local/include on OpenBSD) into the build of libraries/base. --- rules/distdir-opts.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk index d104a13..a2dedb0 100644 --- a/rules/distdir-opts.mk +++ b/rules/distdir-opts.mk @@ -35,7 +35,8 @@ endif $1_$2_BUILD_CC_OPTS = \ $$(SRC_CC_OPTS) \ $$($1_CC_OPTS) \ - $$(foreach dir,$$($1_$2_INCLUDE_DIRS),-I$1/$$(dir)) \ + $$(foreach dir,$$(filter-out /%,$$($1_$2_INCLUDE_DIRS)),-I$1/$$(dir)) \ + $$(foreach dir,$$(filter /%,$$($1_$2_INCLUDE_DIRS)),-I$$(dir)) \ $$($1_$2_CC_OPTS) \ $$($1_$2_CPP_OPTS) \ $$(foreach dir,$$($1_$2_DEP_INCLUDE_DIRS),$$($1_$2_DEP_INCLUDE_DIRS_FLAG)$$(dir)) \ @@ -60,7 +61,8 @@ $1_$2_BUILD_HC_OPTS = \ -i $$(if $$($1_$2_HS_SRC_DIRS),$$(foreach dir,$$($1_$2_HS_SRC_DIRS),-i$1/$$(dir)),-i$1) \ -i$1/$2/build -i$1/$2/build/autogen \ -I$1/$2/build -I$1/$2/build/autogen \ - $$(foreach dir,$$($1_$2_INCLUDE_DIRS),-I$1/$$(dir)) \ + $$(foreach dir,$$(filter-out /%,$$($1_$2_INCLUDE_DIRS)),-I$1/$$(dir)) \ + $$(foreach dir,$$(filter /%,$$($1_$2_INCLUDE_DIRS)),-I$$(dir)) \ $$(foreach inc,$$($1_$2_INCLUDE),-\#include "$$(inc)") \ $$(foreach opt,$$($1_$2_CPP_OPTS),-optP$$(opt)) \ $$(if $$($1_PACKAGE),-optP-include -optP$1/$2/build/autogen/cabal_macros.h) \ -- 1.7.10.4