Commit 358838cb authored by Ian Lynagh's avatar Ian Lynagh Committed by ian@well-typed.com
Browse files

Fix build on Windows: Configure packages in the right order

Also added a comment explaining that addPackages need to be in
dependency order.
parent 0940813c
...@@ -389,6 +389,9 @@ endif ...@@ -389,6 +389,9 @@ endif
endif endif
endef endef
# Add all the packages. Note that we need to add them in dependency
# order, as this is the order that they get configured in.
$(eval $(call addPackage,ghc-prim)) $(eval $(call addPackage,ghc-prim))
ifeq "$(CLEANING)" "YES" ifeq "$(CLEANING)" "YES"
$(eval $(call addPackage,integer-gmp)) $(eval $(call addPackage,integer-gmp))
...@@ -404,9 +407,9 @@ $(eval $(call addPackage,bytestring)) ...@@ -404,9 +407,9 @@ $(eval $(call addPackage,bytestring))
$(eval $(call addPackage,containers)) $(eval $(call addPackage,containers))
$(eval $(call addPackage,old-locale)) $(eval $(call addPackage,old-locale))
$(eval $(call addPackage,old-time)) $(eval $(call addPackage,old-time))
$(eval $(call addPackage,time))
$(eval $(call addPackage,Win32,($$(Windows),YES))) $(eval $(call addPackage,Win32,($$(Windows),YES)))
$(eval $(call addPackage,time))
$(eval $(call addPackage,unix,($$(Windows),NO))) $(eval $(call addPackage,unix,($$(Windows),NO)))
$(eval $(call addPackage,directory)) $(eval $(call addPackage,directory))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment