This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Patch: Unify command for renaming ecjx to host's ecj1


Hi Tom,

The new command to rename the built ecjx executable to the
host's ecj1 executable:

mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)

...suffices for both native and cross builds. Additionally, the current
rename command for cross builds is broken. This patch removes the
native / non-native conditionalization and uses the native version.

Tested on the following (build,host,target) combinations:

- (i686-pc-linux-gnu,i686-pc-linux-gnu,i686-pc-linux-gnu)
- (i686-pc-linux-gnu,i686-pc-linux-gnu,i686-pc-mingw32)
- (i686-pc-linux-gnu,i686-pc-mingw32,i686-pc-mingw32)

OK for trunk?

-- Mohan
http://www.thisiscool.com/
http://www.animalsong.org/

2007-02-03  Mohan Embar  <gnustuff@thisiscool.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (BUILD_ECJ1): Unify the command for renaming ecjx to
	the host's ecj1 executable.

Index: Makefile.am
===================================================================
--- Makefile.am	(revision 121548)
+++ Makefile.am	(working copy)
@@ -454,12 +454,9 @@
 	rm $(DESTDIR)$(toolexeclibdir)/libgcj_bc.la;
 endif
 if BUILD_ECJ1
-if NATIVE
+## Undo any prepending of the target prefix and transform
+## to the actual host's executable suffix.
 	mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
-else !NATIVE
-## Undo the prepending of the target prefix
-	mv $(DESTDIR)$(libexecsubdir)/$(target_noncanonical)-`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext)
-endif !NATIVE
 endif BUILD_ECJ1
 
 ## Install the headers.  It is fairly ugly that we have to do this by




Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]