diff options
| author | simonpj@microsoft.com <unknown> | 2009-07-06 10:34:13 +0000 |
|---|---|---|
| committer | simonpj@microsoft.com <unknown> | 2009-07-06 10:34:13 +0000 |
| commit | b41067a9f85d660e42f2105a9484e7935fd02169 (patch) | |
| tree | 5240d3ac79dfcaa23c8f9e1aa42f304f42b584dd /rules/build-package-way.mk | |
| parent | 8464822fd829e63b2301ced2c2027edeb788f527 (diff) | |
| download | haskell-b41067a9f85d660e42f2105a9484e7935fd02169.tar.gz | |
Windows fixes to build system: use the 'find' and 'sort' found by configure
The build system should use 'find' and 'sort' that are discovered by
configure, not the ones in your path. On Windows the ones in your path
might well be the non-Unixy Windows versions.
This patch fixes the ones I tripped over. There may be more.
Diffstat (limited to 'rules/build-package-way.mk')
| -rw-r--r-- | rules/build-package-way.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index e67d301de6..faa4192ccf 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -30,12 +30,12 @@ $$($1_PACKAGE)-$($1_$2_VERSION)_$2_$3_LIB = $$($1_$2_$3_LIB) $1_$2_$3_DEPS_LIBS=$$(foreach dep,$$($1_$2_DEPS),$$($$(dep)_$2_$3_LIB)) ifneq "$$(BootingFromHc)" "YES" -$1_$2_$3_MKSTUBOBJS = find $1/$2/build -name "*_stub.$$($3_osuf)" -print +$1_$2_$3_MKSTUBOBJS = $$(FIND) $1/$2/build -name "*_stub.$$($3_osuf)" -print # HACK ^^^ we tried to use $(wildcard), but apparently it fails due to # make using cached directory contents, or something. else $1_$2_$3_MKSTUBOBJS = true -$1_$2_$3_C_OBJS += $$(shell find $1/$2/build -name "*_stub.c" -print | sed 's/c$$$$/o/') +$1_$2_$3_C_OBJS += $$(shell $$(FIND) $1/$2/build -name "*_stub.c" -print | sed 's/c$$$$/o/') endif ifeq "$3" "dyn" @@ -51,7 +51,7 @@ else ifeq "$$($1_$2_SplitObjs)" "YES" $$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) "$$(RM)" $$(RM_OPTS) $$@ - (echo $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS); find $$(patsubst %.$$($3_osuf),%_split,$$($1_$2_$3_HS_OBJS)) -name '*.$$($3_osuf)' -print) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ + (echo $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) `$$($1_$2_$3_MKSTUBOBJS)` $$($1_$2_EXTRA_OBJS); $$(FIND) $$(patsubst %.$$($3_osuf),%_split,$$($1_$2_$3_HS_OBJS)) -name '*.$$($3_osuf)' -print) | $$(XARGS) $$(AR) $$(EXTRA_AR_ARGS) $$@ else $$($1_$2_$3_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) "$$(RM)" $$(RM_OPTS) $$@ |