projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stgReallocBytes(DEBUG): don't fail when the ptr passed in is NULL
[ghc-hetmet.git]
/
includes
/
ghc.mk
diff --git
a/includes/ghc.mk
b/includes/ghc.mk
index
007ce4b
..
111b949
100644
(file)
--- a/
includes/ghc.mk
+++ b/
includes/ghc.mk
@@
-46,7
+46,7
@@
endif
ifneq "$(BINDIST)" "YES"
ifneq "$(BINDIST)" "YES"
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
$(includes_H_CONFIG) :
@echo "*** Cross-compiling: please copy $(includes_H_CONFIG) from the target system"
$(includes_H_CONFIG) :
@echo "*** Cross-compiling: please copy $(includes_H_CONFIG) from the target system"
@@
-116,7
+116,7
@@
endif
includes_DERIVEDCONSTANTS = includes/DerivedConstants.h
includes_DERIVEDCONSTANTS = includes/DerivedConstants.h
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
DerivedConstants.h :
@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
DerivedConstants.h :
@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
@@
-127,9
+127,9
@@
else
includes_dist-derivedconstants_C_SRCS = mkDerivedConstants.c
includes_dist-derivedconstants_PROG = mkDerivedConstants$(exeext)
includes_dist-derivedconstants_C_SRCS = mkDerivedConstants.c
includes_dist-derivedconstants_PROG = mkDerivedConstants$(exeext)
-$(eval $(call build-prog,includes,dist-derivedconstants,0))
+$(eval $(call build-prog,includes,dist-derivedconstants,1))
-$(includes_dist-derivedconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
+$(includes_dist-derivedconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
ifneq "$(BINDIST)" "YES"
includes/dist-derivedconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
ifneq "$(BINDIST)" "YES"
@@
-144,7
+144,7
@@
endif
includes_GHCCONSTANTS = includes/GHCConstants.h
includes_GHCCONSTANTS = includes/GHCConstants.h
-ifneq "$(TARGETPLATFORM)" "$(HOSTPLATFORM)"
+ifeq "$(PORTING_HOST)" "YES"
$(includes_GHCCONSTANTS) :
@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
$(includes_GHCCONSTANTS) :
@echo "*** Cross-compiling: please copy DerivedConstants.h from the target system"
@@
-156,10
+156,10
@@
includes_dist-ghcconstants_C_SRCS = mkDerivedConstants.c
includes_dist-ghcconstants_PROG = mkGHCConstants$(exeext)
includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL
includes_dist-ghcconstants_PROG = mkGHCConstants$(exeext)
includes_dist-ghcconstants_CC_OPTS = -DGEN_HASKELL
-$(eval $(call build-prog,includes,dist-ghcconstants,0))
+$(eval $(call build-prog,includes,dist-ghcconstants,1))
ifneq "$(BINDIST)" "YES"
ifneq "$(BINDIST)" "YES"
-$(includes_dist-ghcconstants_depfile) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
+$(includes_dist-ghcconstants_depfile_c_asm) : $(includes_H_CONFIG) $(includes_H_PLATFORM) $(wildcard includes/*.h) $(wildcard rts/*.h)
includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
includes/dist-ghcconstants/build/mkDerivedConstants.o : $(includes_H_CONFIG) $(includes_H_PLATFORM)
@@
-186,10
+186,10
@@
install: install_includes
.PHONY: install_includes
install_includes :
.PHONY: install_includes
install_includes :
- $(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir)
+ $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)"
for d in $(includes_subdirs); do \
for d in $(includes_subdirs); do \
- $(INSTALL_DIR) $(DESTDIR)$(ghcheaderdir)/$$d; \
+ $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)/$$d"; \
done
for i in $(subst includes/,,$(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)); do \
done
for i in $(subst includes/,,$(includes_H_FILES) $(includes_H_CONFIG) $(includes_H_PLATFORM)); do \
- $(INSTALL_HEADER) $(INSTALL_OPTS) includes/$$i $(DESTDIR)$(ghcheaderdir)/$$i; \
+ $(INSTALL_HEADER) $(INSTALL_OPTS) includes/$$i "$(DESTDIR)$(ghcheaderdir)/$$i"; \
done
done