Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 683975 - Disable fixinc and point FLAGS_FOR_TARGET to our headers. r=rail.

Browse Source 
--HG--
extra : rebase_source : a6dcd942c43cd693eb89bff3b4f47ce7aab1b17a
This commit is contained in:
Rafael Ávila de Espíndola 2012-02-28 09:39:54 -05:00
parent fa7c1c7639
commit 9d0041bdfa
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/unix/build-toolchain/build-gcc.py
View File

@ -250,6 +250,8 @@ if not os.path.exists(source_dir):
patch('plugin_finish_decl.diff', 0, gcc_source_dir)
patch('pr49911.diff', 1, gcc_source_dir)
patch('r159628-r163231-r171807.patch', 1, gcc_source_dir)
patch('gcc-fixinc.patch', 1, gcc_source_dir)
patch('gcc-include.patch', 1, gcc_source_dir)
if os.path.exists(build_dir):
shutil.rmtree(build_dir)

12
build/unix/build-toolchain/gcc-fixinc.patch Normal file
View File

@ -0,0 +1,12 @@
diff -ru a/fixincludes/Makefile.in b/fixincludes/Makefile.in
--- a/fixincludes/Makefile.in 2009-07-30 18:33:49.000000000 -0400
+++ b/fixincludes/Makefile.in 2012-02-27 14:59:09.371875951 -0500
@@ -126,7 +126,7 @@
fixlib.o : fixlib.c
fixinc.sh : fixinc.in mkfixinc.sh Makefile
- srcdir="$(srcdir)" $(SHELL) $(srcdir)/mkfixinc.sh $(target)
+ echo "#!/bin/sh" > $@
$(srcdir)/fixincl.x: @MAINT@ fixincl.tpl inclhack.def
cd $(srcdir) ; $(SHELL) ./genfixes

24
build/unix/build-toolchain/gcc-include.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ru a/configure b/configure
--- a/configure 2010-10-06 06:29:55.000000000 -0400
+++ b/configure 2012-02-27 20:46:26.303460301 -0500
@@ -8047,7 +8047,7 @@
# being built; programs in there won't even run.
if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
# Search for pre-installed headers if nothing else fits.
- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include'
+ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(exec_prefix)/bin/ -B$(exec_prefix)/lib/ -isystem $(exec_prefix)/include -isystem $(exec_prefix)/sys-include'
fi
if test "x${use_gnu_ld}" = x &&
diff -ru a/configure.ac b/configure.ac
--- a/configure.ac 2010-10-06 06:29:55.000000000 -0400
+++ b/configure.ac 2012-02-27 20:46:22.587442745 -0500
@@ -3100,7 +3100,7 @@
# being built; programs in there won't even run.
if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
# Search for pre-installed headers if nothing else fits.
- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -isystem $(build_tooldir)/include -isystem $(build_tooldir)/sys-include'
+ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$(exec_prefix)/bin/ -B$(exec_prefix)/lib/ -isystem $(exec_prefix)/include -isystem $(exec_prefix)/sys-include'
fi
if test "x${use_gnu_ld}" = x &&