From e4095c0c85b9c9f70f3c3d665370916e8fd4f616 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 24 Oct 2021 01:15:14 +0000 Subject: Make build system: Put make generated include's in RTS distdirs These are best thought of as being part of the RTS. - After !6791, `ghcautoconf.h` won't be used by the compiler inappropriately. - `ghcversion.h` is only used once outside the RTS, which is `compiler/cbits/genSym.c`. Except we *do* mean the RTS GHC is built against there, so it's better if we always get get the installed version. - `ghcplatform.h` alone is used extensively outside the RTS, but since we no longer have a target platform it is perfectly safe/correct to get the info from the previous RTS. All 3 are exported from the RTS currently and in the bootstrap window. This commit just swaps directories around, such that the new headers may continue to be used in stage 0 despite the reasoning above, but the idea is that we can subsequently make more interesting changes doubling down on the reasoning above. In particular, in !6803 we'll start "morally" moving `ghcautonconf.h` over, introducing an RTS configure script and temporary header of its `AC_DEFINE`s until the top-level configure script doesn't define any more. Progress towards #17191 --- ghc.mk | 4 ---- 1 file changed, 4 deletions(-) (limited to 'ghc.mk') diff --git a/ghc.mk b/ghc.mk index d1a281e648..97c32a8a0f 100644 --- a/ghc.mk +++ b/ghc.mk @@ -1349,7 +1349,6 @@ clean : clean_files clean_libraries clean_files : $(call removeFiles,$(CLEAN_FILES)) # this is here since CLEAN_FILES can't handle folders - $(call removeTrees,rts/include/dist-derivedconstants) $(call removeTrees,inplace/bin) $(call removeTrees,inplace/lib) $(call removeTrees,libraries/bootstrapping.conf) @@ -1434,9 +1433,6 @@ distclean : clean $(call removeFiles,bindist-list.uniq) $(call removeTrees,bindisttest/a) -# Not sure why this is being cleaned here. - $(call removeTrees,rts/include/dist-derivedconstants) - # Also clean Windows-only inplace directories. # Don't delete 'inplace' itself, it contains source files. $(call removeTrees,inplace/mingw) -- cgit v1.2.1