From: Owen Avery <[email protected]>
gcc/rust/ChangeLog:
* Make-lang.in: Handle source files in checks/errors/feature.
* checks/errors/rust-feature-gate.cc: Move to...
* checks/errors/feature/rust-feature-gate.cc: ...here.
* checks/errors/rust-feature-gate.h: Move to...
* checks/errors/feature/rust-feature-gate.h: ...here.
* checks/errors/rust-feature.cc: Move to...
* checks/errors/feature/rust-feature.cc: ...here.
* checks/errors/rust-feature.h: Move to...
* checks/errors/feature/rust-feature.h: ...here.
Signed-off-by: Owen Avery <[email protected]>
---
gcc/rust/Make-lang.in | 6 ++++++
gcc/rust/checks/errors/{ => feature}/rust-feature-gate.cc | 0
gcc/rust/checks/errors/{ => feature}/rust-feature-gate.h | 0
gcc/rust/checks/errors/{ => feature}/rust-feature.cc | 0
gcc/rust/checks/errors/{ => feature}/rust-feature.h | 0
5 files changed, 6 insertions(+)
rename gcc/rust/checks/errors/{ => feature}/rust-feature-gate.cc (100%)
rename gcc/rust/checks/errors/{ => feature}/rust-feature-gate.h (100%)
rename gcc/rust/checks/errors/{ => feature}/rust-feature.cc (100%)
rename gcc/rust/checks/errors/{ => feature}/rust-feature.h (100%)
diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index 90ddc8b2998..e5a8a5eb462 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -434,6 +434,7 @@ RUST_INCLUDES = -I $(srcdir)/rust \
-I $(srcdir)/rust/checks/errors \
-I $(srcdir)/rust/checks/errors/privacy \
-I $(srcdir)/rust/checks/errors/borrowck \
+ -I $(srcdir)/rust/checks/errors/feature \
-I $(srcdir)/rust/util \
-I $(srcdir)/rust/metadata \
-I $(srcdir)/../libgrust
@@ -506,6 +507,11 @@ rust/%.o: rust/checks/errors/%.cc
$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
$(POSTCOMPILE)
+# build feature related files in rust folder
+rust/%.o: rust/checks/errors/feature/%.cc
+ $(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
+ $(POSTCOMPILE)
+
# build privacy pass files in rust folder
rust/%.o: rust/checks/errors/privacy/%.cc
$(COMPILE) $(RUST_CXXFLAGS) $(RUST_INCLUDES) $<
diff --git a/gcc/rust/checks/errors/rust-feature-gate.cc
b/gcc/rust/checks/errors/feature/rust-feature-gate.cc
similarity index 100%
rename from gcc/rust/checks/errors/rust-feature-gate.cc
rename to gcc/rust/checks/errors/feature/rust-feature-gate.cc
diff --git a/gcc/rust/checks/errors/rust-feature-gate.h
b/gcc/rust/checks/errors/feature/rust-feature-gate.h
similarity index 100%
rename from gcc/rust/checks/errors/rust-feature-gate.h
rename to gcc/rust/checks/errors/feature/rust-feature-gate.h
diff --git a/gcc/rust/checks/errors/rust-feature.cc
b/gcc/rust/checks/errors/feature/rust-feature.cc
similarity index 100%
rename from gcc/rust/checks/errors/rust-feature.cc
rename to gcc/rust/checks/errors/feature/rust-feature.cc
diff --git a/gcc/rust/checks/errors/rust-feature.h
b/gcc/rust/checks/errors/feature/rust-feature.h
similarity index 100%
rename from gcc/rust/checks/errors/rust-feature.h
rename to gcc/rust/checks/errors/feature/rust-feature.h
--
2.50.1
