diff options
| author | Austin Seipp <austin@well-typed.com> | 2013-11-12 16:43:50 -0600 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2013-11-22 08:04:53 -0600 |
| commit | 50055afe0dea0bcea8eea8d53353dfd0f1f204ca (patch) | |
| tree | 0d5fd3440666828edfac5dc1a78a1dca3e0db1ae /rules/build-prog.mk | |
| parent | 5bab1a57f572e29dfdffd6d1ce8e53a2772b18fd (diff) | |
| download | haskell-50055afe0dea0bcea8eea8d53353dfd0f1f204ca.tar.gz | |
Fix make binary-dist on OS X (#8122)
Authored-by: Christiaan Baaj <christiaan.baaij@gmail.com>
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'rules/build-prog.mk')
| -rw-r--r-- | rules/build-prog.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/rules/build-prog.mk b/rules/build-prog.mk index 54424cf37e..5837bb0c84 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -285,12 +285,6 @@ $1/$2/build/tmp/$$($1_$2_PROG) : $$(ALL_STAGE1_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_L endif endif endif -endif - -ifneq "$$($1_$2_INSTALL_INPLACE)" "NO" -$(call all-target,$1_$2,$$($1_$2_INPLACE)) -endif -$(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE)) # INPLACE_BIN might be empty if we're distcleaning ifeq "$(findstring clean,$(MAKECMDGOALS))" "" @@ -300,6 +294,13 @@ $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG_INPLACE) | $$$$(dir $$$$@)/. endif endif +endif + +ifneq "$$($1_$2_INSTALL_INPLACE)" "NO" +$(call all-target,$1_$2,$$($1_$2_INPLACE)) +endif +$(call clean-target,$1,$2_inplace,$$($1_$2_INPLACE)) + ifeq "$$($1_$2_INSTALL)" "YES" ifeq "$$($1_$2_PROG_NEEDS_C_WRAPPER)" "YES" INSTALL_LIBS += $1/$2/build/tmp/$$($1_$2_PROG).dll |