summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-10-26 09:29:12 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2015-10-27 13:27:45 +0100
commitc10c01cdd59c5068efcb480c4cc8fb50f354e0b1 (patch)
treee1dd4e4c011018351eeaefce91326c266554735a /rules
parenta9c93bdd8b027d6de09a3eada7721e7fd2d3e050 (diff)
downloadhaskell-c10c01cdd59c5068efcb480c4cc8fb50f354e0b1.tar.gz
Build system: comments only [skip ci]
Diffstat (limited to 'rules')
-rw-r--r--rules/build-package-way.mk19
-rw-r--r--rules/build-prog.mk2
2 files changed, 11 insertions, 10 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index 2dc43ff8b8..a10e53833e 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -89,16 +89,17 @@ $$($1_$2_$3_LIB0) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS
$$(call build-dll,$1,$2,$3,,$$($1_$2_dll0_HS_OBJS) $$($1_$2_$3_NON_HS_OBJS),$$($1_$2_$3_LIB0))
endif
-else
-
+else # ifneq "$$(HostOS_CPP)" "mingw32"
$$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS)
$$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) $$($1_$2_$3_GHC_LD_OPTS) $$($1_$2_$3_ALL_OBJS) \
-shared -dynamic -dynload deploy \
$$(addprefix -l,$$($1_$2_EXTRA_LIBRARIES)) $$(addprefix -L,$$($1_$2_EXTRA_LIBDIRS)) \
-no-auto-link-packages \
-o $$@
-endif
-else
+endif # "$$(HostOS_CPP)" "mingw32"
+
+else # ifneq "$3" "dyn"
+
# Build the ordinary .a library
$$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS)
$$(call removeFiles,$$@ $$@.contents)
@@ -123,7 +124,7 @@ $$($1_$2_$3_LIB0) :
endif
endif
-endif
+endif # "$3" "dyn"
$(call all-target,$1_$2,all_$1_$2_$3)
$(call all-target,$1_$2_$3,$$($1_$2_$3_LIB))
@@ -155,12 +156,12 @@ ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES"
ifneq "$4" "0"
$(call all-target,$1_$2,$$($1_$2_GHCI_LIB))
endif
-endif
-endif
-endif
+endif # "$$($1_$2_BUILD_GHCI_LIB)" "YES"
+endif # "$3" "v"
+endif # "$$(DYNAMIC_GHC_PROGRAMS)" "YES"
$(call profEnd, build-package-way($1,$2,$3))
-endef
+endef # build-package-way
# $1 = dir
# $2 = distdir
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 2a2049bb3f..1a497078c5 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -283,7 +283,7 @@ $$($1_$2_INPLACE) : $1/$2/build/tmp/$$($1_$2_PROG_INPLACE) | $$$$(dir $$$$@)/.
$$(INSTALL) -m 755 $$< $$@
endif
-endif # BINDIST=YES
+endif # BINDIST
ifneq "$$($1_$2_INSTALL_INPLACE)" "NO"
$(call all-target,$1_$2,$$($1_$2_INPLACE))