commit bcc1379bdab5bc79ae00dc3c9a844ced20f8c543
author Alexandre Julliard <julliard@winehq.org> Mon Feb 02 15:11:13 2009 +0100
committer Alexandre Julliard <julliard@winehq.org> Sat May 30 15:20:14 2009 +0200
tree 7c05fc47c262d7ee04dae46ee82154fd2ece0a82
parent b09418b5d263e3a9ed94c7b7538879de2c2ce528

winegcc: Add support for the --sysroot option to allow out-of-tree cross-compiling.

Make.rules.in

diff --git a/Make.rules.in b/Make.rules.in
index db84e90..a259da9 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -71,7 +71,7 @@
 WRC          = $(TOOLSDIR)/tools/wrc/wrc
 WMC          = $(TOOLSDIR)/tools/wmc/wmc
 WIDL         = $(TOOLSDIR)/tools/widl/widl
-WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild
+WINEGCC      = $(TOOLSDIR)/tools/winegcc/winegcc $(TARGETFLAGS) -B$(TOOLSDIR)/tools/winebuild --sysroot=$(TOPOBJDIR)
 RELPATH      = $(TOOLSDIR)/tools/relpath
 SFNT2FNT     = $(TOOLSDIR)/tools/sfnt2fnt
 FNT2FON      = $(TOOLSDIR)/tools/fnt2fon

tools/winegcc/winegcc.c

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 491a733..4e41033 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -1154,6 +1154,12 @@
                 case '-':
                     if (strcmp("-static", argv[i]+1) == 0)
                         linking = -1;
+                    else if (!strncmp("--sysroot", argv[i], 9) && opts.wine_objdir)
+                    {
+                        if (argv[i][9] == '=') opts.wine_objdir = argv[i] + 10;
+                        else opts.wine_objdir = argv[++i];
+                        raw_compiler_arg = raw_linker_arg = 0;
+                    }
                     break;
             }