diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-01-08 19:36:14 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-01-08 23:11:06 +0000 |
| commit | 9e452874df05f5f98243576ffaefc2f356358038 (patch) | |
| tree | bad3b659234883643d088b48034a6bd99e2b851f /includes/ghc.mk | |
| parent | 4c49eb512499255fe7de0e6cfc08ed138957d583 (diff) | |
| download | haskell-9e452874df05f5f98243576ffaefc2f356358038.tar.gz | |
Refactoring
This is working towards being able to put ghcautoconf.h and
ghcplatform.h in includes/dist
Diffstat (limited to 'includes/ghc.mk')
| -rw-r--r-- | includes/ghc.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk index cef12dcabc..ef994f2329 100644 --- a/includes/ghc.mk +++ b/includes/ghc.mk @@ -41,9 +41,7 @@ ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO" includes_CC_OPTS += -DTABLES_NEXT_TO_CODE endif -includes_CC_OPTS += -Iincludes -includes_CC_OPTS += -Iincludes/dist-derivedconstants/header -includes_CC_OPTS += -Iincludes/dist-ghcconstants/header +includes_CC_OPTS += $(addprefix -I,$(GHC_INCLUDE_DIRS)) includes_CC_OPTS += -Irts ifneq "$(GhcWithSMP)" "YES" @@ -65,7 +63,7 @@ $(includes_H_CONFIG) : else -$(includes_H_CONFIG) : mk/config.h mk/config.mk includes/ghc.mk +$(includes_H_CONFIG) : mk/config.h mk/config.mk includes/ghc.mk | $$(dir $$@)/. @echo "Creating $@..." @echo "#ifndef __GHCAUTOCONF_H__" >$@ @echo "#define __GHCAUTOCONF_H__" >>$@ @@ -76,7 +74,7 @@ $(includes_H_CONFIG) : mk/config.h mk/config.mk includes/ghc.mk endif -$(includes_H_PLATFORM) : includes/Makefile +$(includes_H_PLATFORM) : includes/Makefile | $$(dir $$@)/. $(call removeFiles,$@) @echo "Creating $@..." @echo "#ifndef __GHCPLATFORM_H__" >$@ |