This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [patch] wrong symlinks for header files when configured with --program-suffix
- From: Matthias Klose <doko at ubuntu dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Mon, 11 May 2009 10:22:54 +0200
- Subject: Re: [patch] wrong symlinks for header files when configured with --program-suffix
- References: <49F04387.5020300@ubuntu.com>
Matthias Klose schrieb:
> Don't use gcj, but run it through transform, as done in the same target in all
> other places. Checking in this as obvious on the trunk and the branch.
hmm, I did check in the wrong patch on the branch, which doesn't fix the
symlinks to the header files, but adds a symlink for javac. Reverting this
change (javac cannot be linked to gcj, it has to be at least a shell script, and
usually is a symlink to ecj), and applying the header fix.
Matthias
Index: Makefile.am
===================================================================
--- Makefile.am (revision 147340)
+++ Makefile.am (working copy)
@@ -585,8 +585,6 @@
RELATIVE=$$(relative $(DESTDIR)$(bindir) $(DESTDIR)$(SDK_BIN_DIR)); \
ln -sf $$RELATIVE/`echo gij | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/java; \
- ln -sf $$RELATIVE/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
- $(DESTDIR)$(SDK_BIN_DIR)/javac; \
ln -sf $$RELATIVE/`echo gjar | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
$(DESTDIR)$(SDK_BIN_DIR)/jar; \
ln -sf $$RELATIVE/`echo gjdoc | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -676,7 +674,7 @@
ln -sf $$RELATIVE/libgcj-tools-$(gcc_version).jar \
$(DESTDIR)$(SDK_LIB_DIR)/tools.jar; \
for headername in jawt jni; do \
- DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
+ DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
-print-file-name=include/$$headername.h)); \
RELATIVE=$$(relative $$DIRECTORY \
$(DESTDIR)$(SDK_INCLUDE_DIR)); \
@@ -684,7 +682,7 @@
$(DESTDIR)$(SDK_INCLUDE_DIR)/$$headername.h; \
done; \
for headername in jawt_md jni_md; do \
- DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/gcj \
+ DIRECTORY=$$(dirname $$($(DESTDIR)$(bindir)/`echo gcj | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
-print-file-name=include/$$headername.h)); \
RELATIVE=$$(relative $$DIRECTORY \
$(DESTDIR)$(SDK_INCLUDE_DIR)/linux); \