OSDN Git Service

Fix long-standing in-tree build include-fixed bug.
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 19 Sep 2009 08:29:58 +0000 (08:29 +0000)
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>
Sat, 19 Sep 2009 08:29:58 +0000 (08:29 +0000)
gcc/:
PR bootstrap/35619
* Makefile.in (stmp-fixinc): Ensure `include-fixed' is created
in the directory this rule is called from, rather than the
toplevel 'gcc' directory, to fix in-tree build.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151880 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/Makefile.in

index 27f877f..bc78ee3 100644 (file)
@@ -1,3 +1,10 @@
+2009-09-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR bootstrap/35619
+       * Makefile.in (stmp-fixinc): Ensure `include-fixed' is created
+       in the directory this rule is called from, rather than the
+       toplevel 'gcc' directory, to fix in-tree build.
+
 2009-09-19  Chris Demetriou  <cgd@google.com>
 
        PR preprocessor/28435:
index cbd68d8..fde75ca 100644 (file)
@@ -3835,9 +3835,10 @@ stmp-fixinc: gsyslimits.h macro_list fixinc_list \
            chmod a+rx $${fix_dir} || true; \
            (TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
              SHELL='$(SHELL)'; MACRO_LIST=`${PWD_COMMAND}`/macro_list ; \
+             gcc_dir=`${PWD_COMMAND}` ; \
              export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
              cd $(build_objdir)/fixincludes && \
-             $(SHELL) ./fixinc.sh ../../gcc/$${fix_dir} \
+             $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
                $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
            rm -f $${fix_dir}/syslimits.h; \
            if [ -f $${fix_dir}/limits.h ]; then \