diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2019-08-29 18:42:26 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-09-01 22:44:45 -0400 |
| commit | 9acba78004d4d4a149b9e1480d1d8c44b7a27cec (patch) | |
| tree | 3bea723ccd1cccf43f9fcce550addb3c2c36da14 /rules | |
| parent | cfab4abeaffa8b6a78a19bbfa485169a9c772741 (diff) | |
| download | haskell-9acba78004d4d4a149b9e1480d1d8c44b7a27cec.tar.gz | |
Use C99 Fixed width types to avoid hack in base's configure
Define MD5Context in terms of `uint*_t` and don't use `HsFFI.h`.
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 49c54461d2..1c5987e63d 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -62,7 +62,9 @@ endif # We filter out -Werror from SRC_CC_OPTS, because when configure tests # for a feature it may not generate warning-free C code, and thus may # think that the feature doesn't exist if -Werror is on. -$1_$2_CONFIGURE_CFLAGS = $$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS) $$(SRC_CC_WARNING_OPTS) +# +# Do `-iquote $(TOP)/$1` so package configure scripts can access their own source. +$1_$2_CONFIGURE_CFLAGS = $$(filter-out -Werror,$$(SRC_CC_OPTS)) $$(CONF_CC_OPTS_STAGE$3) $$($1_CC_OPTS) $$($1_$2_CC_OPTS) $$(SRC_CC_WARNING_OPTS) -iquote $(TOP)/$1 $1_$2_CONFIGURE_LDFLAGS = $$(SRC_LD_OPTS) $$($1_LD_OPTS) $$($1_$2_LD_OPTS) $1_$2_CONFIGURE_CPPFLAGS = $$(SRC_CPP_OPTS) $$(CONF_CPP_OPTS_STAGE$3) $$($1_CPP_OPTS) $$($1_$2_CPP_OPTS) |