rust_OBJS = $(RUST_ALL_OBJS) rust/rustspec.o
-RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro
-RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro/libproc_macro.a
+RUST_LDFLAGS = $(LDFLAGS) -L./../libgrust/libproc_macro_internal
+RUST_LIBDEPS = $(LIBDEPS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a
# The compiler itself is called crab1
crab1$(exeext): $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(RUST_LIBDEPS) $(rust.prev)
@$(call LINK_PROGRESS,$(INDEX.rust),start)
+$(LLINKER) $(ALL_LINKERFLAGS) $(RUST_LDFLAGS) -o $@ \
- $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro/libproc_macro.a $(BACKENDLIBS)
+ $(RUST_ALL_OBJS) attribs.o $(BACKEND) $(LIBS) ../libgrust/libproc_macro_internal/libproc_macro_internal.a $(BACKENDLIBS)
@$(call LINK_PROGRESS,$(INDEX.rust),end)
# Build hooks.
#include "rust-token-converter.h"
#include "rust-ast-collector.h"
#include "rust-system.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
// Provides objects and method prototypes for macro expansion
#ifndef RUST_PROC_MACRO_H
#define RUST_PROC_MACRO_H
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
namespace Rust {
/**
#include "rust-hir-full-decls.h"
#include "rust-lang-item.h"
#include "rust-privacy-common.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
namespace Rust {
namespace Analysis {
#include "rust-lex.h"
#include "rust-token-converter.h"
-#include "libproc_macro/proc_macro.h"
#include "bi-map.h"
#include "line-map.h"
#include <vector>
#include "rust-token.h"
-#include "libproc_macro/proc_macro.h"
+#include "libproc_macro_internal/proc_macro.h"
namespace Rust {
GCC_DIR = $(TOP_GCCDIR)/gcc
RUST_SRC = $(GCC_DIR)/rust
-SUBDIRS = libproc_macro
+SUBDIRS = libproc_macro_internal
RUST_BUILDDIR := $(shell pwd)
TOP_GCCDIR := $(shell cd $(top_srcdir) && cd .. && pwd)
GCC_DIR = $(TOP_GCCDIR)/gcc
RUST_SRC = $(GCC_DIR)/rust
-SUBDIRS = libproc_macro
+SUBDIRS = libproc_macro_internal
RUST_BUILDDIR := $(shell pwd)
# Work around what appears to be a GNU make bug handling MAKEFLAGS
-ac_config_files="$ac_config_files libproc_macro/Makefile"
+ac_config_files="$ac_config_files libproc_macro_internal/Makefile"
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "libproc_macro/Makefile") CONFIG_FILES="$CONFIG_FILES libproc_macro/Makefile" ;;
+ "libproc_macro_internal/Makefile") CONFIG_FILES="$CONFIG_FILES libproc_macro_internal/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
_LT_EOF
;;
- "libproc_macro/Makefile":F) cat > vpsed$$ << \_EOF
+ "libproc_macro_internal/Makefile":F) cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
sed -f vpsed$$ $ac_file > tmp$$
AC_SUBST(toolexeclibdir)
-AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro], [DIR/Makefile ]),
+AC_CONFIG_FILES(AC_FOREACH([DIR], [libproc_macro_internal], [DIR/Makefile ]),
[ cat > vpsed$$ << \_EOF
s!`test -f '$<' || echo '$(srcdir)/'`!!
_EOF
"WERROR=$(WERROR)" \
"TARGET_LIB_PATH=$(TARGET_LIB_PATH)"
-TARGETLIB = ./libproc_macro.a
+
+TARGETLIB = ./libproc_macro_internal.a
LIBOBJS = @LIBOBJS@
objext = @OBJEXT@
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-subdir = libproc_macro
+subdir = libproc_macro_internal
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/cet.m4 \
"WERROR=$(WERROR)" \
"TARGET_LIB_PATH=$(TARGET_LIB_PATH)"
-TARGETLIB = ./libproc_macro.a
+TARGETLIB = ./libproc_macro_internal.a
objext = @OBJEXT@
REQUIRED_OFILES = \
./proc_macro.$(objext) \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libproc_macro/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libproc_macro_internal/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign libproc_macro/Makefile
+ $(AUTOMAKE) --foreign libproc_macro_internal/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \