diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-20 21:40:37 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-06-20 21:40:37 +0530 |
| commit | 7effb31fa201213929eb2cefc3c2b52013e307ac (patch) | |
| tree | 2553c0db12d4d71d9c9de0757f1eaefb9ebc2ddd /mk | |
| parent | 6bff14ffea5a3ca3f3b439b011954b521eb21a09 (diff) | |
| parent | 634fced396f180eea18a828bdddec3deded61ab8 (diff) | |
| download | rust-7effb31fa201213929eb2cefc3c2b52013e307ac.tar.gz rust-7effb31fa201213929eb2cefc3c2b52013e307ac.zip | |
Rollup merge of #26452 - michaelsproul:the-second-coming, r=pnkfelix
As per #26009 this PR implements a new collation system for extended-error metadata. I've tried to keep it as simple as possible for now, so there's no uniqueness checking and minimal modularity. Although using a lint was discussed in #26009 I decided against this because it would require converting the AST output from the plugin back into an internal data-structure. Emitting the metadata from within the plugin prevents this double-handling. We also didn't identify this as the source of the failures last time, although something untoward was definitely happening... With that in mind I would like as much feedback as possible on this before it's merged, I don't want to break the bots again! I've successfully built for my host architecture and I'm building an ARM cross-compiler now to test my assumptions about the various `CFG` variables. Despite the confusing name of `CFG_COMPILER_HOST_TRIPLE` it is actually the compile time target triple, as explained in `mk/target.mk`. ``` # This is the compile-time target-triple for the compiler. For the compiler at # runtime, this should be considered the host-triple. More explanation for why # this exists can be found on issue #2400 export CFG_COMPILER_HOST_TRIPLE ``` CC @pnkfelix @brson @nrc @alexcrichton Closes #25705, closes #26009.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/docs.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mk/docs.mk b/mk/docs.mk index 0f3d84cf631..617c3ddf8de 100644 --- a/mk/docs.mk +++ b/mk/docs.mk @@ -77,8 +77,7 @@ ERR_IDX_GEN = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE) D := $(S)src/doc -# FIXME (#25705) eventually may want to put error-index target back here. -DOC_TARGETS := trpl style +DOC_TARGETS := trpl style error-index COMPILER_DOC_TARGETS := DOC_L10N_TARGETS := |