diff options
| author | Bernd Schmidt <bernds@codesourcery.com> | 2011-05-26 13:12:11 +0000 |
|---|---|---|
| committer | Bernd Schmidt <bernds@gcc.gnu.org> | 2011-05-26 13:12:11 +0000 |
| commit | d11bf18f560999725b1fbbb393f7d12a1b751a59 (patch) | |
| tree | 4800e34a459326bfa11320f01a3441825ff8846a /gcc/Makefile.in | |
| parent | ac8e18759f24063961458ba1e94ca0bfa3138775 (diff) | |
| download | gcc-d11bf18f560999725b1fbbb393f7d12a1b751a59.zip gcc-d11bf18f560999725b1fbbb393f7d12a1b751a59.tar.gz gcc-d11bf18f560999725b1fbbb393f7d12a1b751a59.tar.bz2 | |
Makefile.in (srcdirify): Change order so that libgcc_objdir is substituted first.
* Makefile.in (srcdirify): Change order so that libgcc_objdir is
substituted first.
* libgcc-std.ver: Delete file.
From-SVN: r174284
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 06a4ebc..70eb9fb 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1894,13 +1894,15 @@ cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS) LIB2ADD = $(LIB2FUNCS_EXTRA) LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) -# All source files for libgcc are either in the source directory (in -# which case they will start with $(srcdir)), or generated into the build -# directory (in which case they will be relative paths). -srcdirify = $(patsubst $(srcdir)%,$$(gcc_srcdir)%,$(filter $(srcdir)%,$(1))) \ - $(patsubst $$(libgcc_objdir)/%,%, \ +# All source files for libgcc are either generated in the libgcc build +# directory which will be substituted for $$(libgcc_objdir), in the +# source directory (in which case they will start with $(srcdir)), or +# generated into the build directory (in which case they will be +# relative paths). +srcdirify = $(patsubst $$(libgcc_objdir)/%,%, \ $(filter $$(libgcc_objdir)%,$(1))) \ - $(patsubst %,$$(gcc_objdir)/%, \ + $(patsubst $(srcdir)%,$$(gcc_srcdir)%,$(filter $(srcdir)%,$(1))) \ + $(patsubst %,$$(gcc_objdir)/%, \ $(filter-out $(srcdir)% $$(libgcc_objdir)%,$(1))) # The distinction between these two variables is no longer relevant, |