[Cegcc-svn] SF.net SVN: cegcc: [1115] trunk/cegcc/src/mingw

[<ped...@us...>]

Revision: 1115
          http://cegcc.svn.sourceforge.net/cegcc/?rev=1115&view=rev
Author:   pedroalves
Date:     2007-12-25 15:03:53 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
	* Makefile.in, mingwex/Makefile.in, profile/Makefile.in: Use
	$host_alias instead of $target_alias throughout.  Use $build,
	$host, $target instead of the aliases to detect a native build.
	Pass $build, $build_alias, $host, $host_alias, $target and
	$target_alias to sub-Makefiles.

Modified Paths:
--------------
    trunk/cegcc/src/mingw/ChangeLog.mingw32ce
    trunk/cegcc/src/mingw/Makefile.in
    trunk/cegcc/src/mingw/mingwex/Makefile.in
    trunk/cegcc/src/mingw/profile/Makefile.in

Modified: trunk/cegcc/src/mingw/ChangeLog.mingw32ce
===================================================================
--- trunk/cegcc/src/mingw/ChangeLog.mingw32ce	2007-12-25 23:00:10 UTC (rev 1114)
+++ trunk/cegcc/src/mingw/ChangeLog.mingw32ce	2007-12-25 23:03:53 UTC (rev 1115)
@@ -1,5 +1,13 @@
 2007-12-25  Pedro Alves  <ped...@po...>
 
+	* Makefile.in, mingwex/Makefile.in, profile/Makefile.in: Use
+	$host_alias instead of $target_alias throughout.  Use $build,
+	$host, $target instead of the aliases to detect a native build.
+	Pass $build, $build_alias, $host, $host_alias, $target and
+	$target_alias to sub-Makefiles.
+
+2007-12-25  Pedro Alves  <ped...@po...>
+
 	* Makefile.in: s/wince/mingw32ce/g from host matchings.
 	* mingwexlibce/Makefile.in: Likewise.
 

Modified: trunk/cegcc/src/mingw/Makefile.in
===================================================================
--- trunk/cegcc/src/mingw/Makefile.in	2007-12-25 23:00:10 UTC (rev 1114)
+++ trunk/cegcc/src/mingw/Makefile.in	2007-12-25 23:03:53 UTC (rev 1115)
@@ -25,8 +25,11 @@
 srcdir = @srcdir@
 objdir = .
 
+build = @build@
+build_alias = @build_alias@
+host = @host@
 host_alias = @host_alias@
-build_alias = @build_alias@
+target = @target@
 target_alias = @target_alias@
 with_cross_host = @with_cross_host@
 prefix = @prefix@
@@ -36,25 +39,25 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-ifeq ($(target_alias),$(host_alias))
-ifeq ($(build_alias),$(host_alias))
+ifeq ($(target),$(host))
+ifeq ($(build),$(host))
 tooldir:=$(exec_prefix)
 else
-tooldir:=$(exec_prefix)/$(target_alias)
+tooldir:=$(exec_prefix)/$(host_alias)
 endif
 else
-tooldir:=$(exec_prefix)/$(target_alias)
+tooldir:=$(exec_prefix)/$(host_alias)
 endif
 datadir = @datadir@
 infodir = @infodir@
 includedir = @includedir@
-ifneq (,$(findstring cygwin,$(target_alias)))
+ifneq (,$(findstring cygwin,$(host_alias)))
 inst_bindir:=$(tooldir)/bin
 inst_includedir:=$(tooldir)/include/mingw
 inst_libdir:=$(tooldir)/lib/mingw
 inst_docdir:=$(tooldir)/share/doc/mingw-runtime
 else
-ifneq (,$(findstring mingw32ce,$(target_alias)))
+ifneq (,$(findstring mingw32ce,$(host_alias)))
 inst_bindir:=$(tooldir)/bin
 inst_includedir:=$(tooldir)/include
 inst_libdir:=$(tooldir)/lib
@@ -86,7 +89,7 @@
 mkinstalldirs = $(SHELL) @MKINSTALLDIRS@
 
 CC := @CC@
-ifneq (,$(findstring cygwin,$(target_alias)))
+ifneq (,$(findstring cygwin,$(host_alias)))
 override CC := ${filter-out -L% -B%,${shell echo $(CC) | sed -e 's%\(-isystem\|-iwithprefixbefore\)  *[^ ]*\( \|$$\)% %g'}}
 endif
 # FIXME: Which is it, CC or CC_FOR_TARGET?
@@ -164,13 +167,18 @@
 	inst_libdir="$(inst_libdir)" \
 	inst_docdir="$(inst_docdir)" \
 	prefix="$(prefix)" \
+	build="$(build)" \
+	build_alias="$(build_alias)" \
+	host="$(host)" \
+	host_alias="$(host_alias)" \
+	target="$(target)" \
 	target_alias="$(target_alias)" \
 	TAR="$(TAR)" \
 	TARFLAGS="$(TARFLAGS)" \
 	TARFILEEXT="$(TARFILEEXT)"
 
 CRT0S = CRT_noglob.o crtmt.o crtst.o
-ifneq (,$(findstring mingw32ce,$(target_alias)))
+ifneq (,$(findstring mingw32ce,$(host_alias)))
 CRT0S += crt3.o dllcrt3.o
 else
 CRT0S += crt1.o dllcrt1.o crt2.o dllcrt2.o CRT_fp8.o CRT_fp10.o txtmode.o binmode.o

Modified: trunk/cegcc/src/mingw/mingwex/Makefile.in
===================================================================
--- trunk/cegcc/src/mingw/mingwex/Makefile.in	2007-12-25 23:00:10 UTC (rev 1114)
+++ trunk/cegcc/src/mingw/mingwex/Makefile.in	2007-12-25 23:03:53 UTC (rev 1115)
@@ -6,14 +6,14 @@
 srcdir = @srcdir@
 objdir = .
 
-target_alias = @target_alias@
+host_alias = @host_alias@
 prefix = @prefix@
 
 program_transform_name = @program_transform_name@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
+tooldir = $(exec_prefix)/$(host_alias)
 datadir = @datadir@
 infodir = @infodir@
 includedir = @includedir@
@@ -240,7 +240,7 @@
 	strtodg.o strtodnrp.o strtof.o strtopx.o sum.o ulp.o
 
 MATHCE_FLAGS=
-ifneq (,$(findstring mingw32ce,$(target_alias)))
+ifneq (,$(findstring mingw32ce,$(host_alias)))
 LIB_OBJS = $(WINCE_OBJS) $(MATHCE_OBJS) $(Q8_OBJS) $(STDIO_OBJS_CE) \
 	$(POSIX_OBJS)
 MATHCE_FLAGS=-D_IEEE_LIBM

Modified: trunk/cegcc/src/mingw/profile/Makefile.in
===================================================================
--- trunk/cegcc/src/mingw/profile/Makefile.in	2007-12-25 23:00:10 UTC (rev 1114)
+++ trunk/cegcc/src/mingw/profile/Makefile.in	2007-12-25 23:03:53 UTC (rev 1115)
@@ -7,14 +7,14 @@
 srcdir = @srcdir@
 objdir = .
 
-target_alias = @target_alias@
+host_alias = @host_alias@
 prefix = @prefix@
 
 program_transform_name = @program_transform_name@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
+tooldir = $(exec_prefix)/$(host_alias)
 datadir = @datadir@
 infodir = @infodir@
 includedir = @includedir@


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.