public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
From: cagney@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM] master: When --enable-jar-compile; link against .so and not .a.
Date: Mon, 26 Nov 2007 18:38:00 -0000 [thread overview]
Message-ID: <20071126183834.22305.qmail@sourceware.org> (raw)
The branch, master has been updated
via 37f01a74321572e8e008360235e8fb49cceea05a (commit)
from a9e0843c888cab517a488878e005dd84583bb23a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 37f01a74321572e8e008360235e8fb49cceea05a
Author: Andrew Cagney <cagney@toil.yyz.redhat.com>
Date: Mon Nov 26 13:30:36 2007 -0500
When --enable-jar-compile; link against .so and not .a.
frysk-common/ChangeLog
2007-11-26 Andrew Cagney <cagney@redhat.com>
* Makefile.rules (GEN_GCC_BUILDTREE_RPATHS): Move to near use.
* Makefile.gen.sh (echo_LDFLAGS): Dependant on JAR_COMPILE, set
LDFLAGS or LDADD to list of libraries to link against.
-----------------------------------------------------------------------
Summary of changes:
frysk-common/ChangeLog | 4 ++++
frysk-common/Makefile.gen.sh | 17 ++++++++++-------
frysk-common/Makefile.rules | 3 +--
3 files changed, 15 insertions(+), 9 deletions(-)
First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index ec27921..79ffe00 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,5 +1,9 @@
2007-11-26 Andrew Cagney <cagney@redhat.com>
+ * Makefile.rules (GEN_GCC_BUILDTREE_RPATHS): Move to near use.
+ * Makefile.gen.sh (echo_LDFLAGS): Dependant on JAR_COMPILE, set
+ LDFLAGS or LDADD to list of libraries to link against.
+
* Makefile.gen.sh (.cxx): Fix typo, do not conditionally add .cxx
files to sources.
* Makefile.rules (.jar.o): Remove -fjni option.
diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh
index 11b6de8..e22c26d 100755
--- a/frysk-common/Makefile.gen.sh
+++ b/frysk-common/Makefile.gen.sh
@@ -270,14 +270,19 @@ echo_LDFLAGS ()
local name_=`echo_name_ $1`
local class=`echo $1 | tr '[/]' '[.]'`
echo "${name_}_LDFLAGS = --main=${class}"
+ echo "if JAR_COMPILE"
+ echo "${name_}_LDFLAGS += \${GEN_GCJ_SO_FLAGS}"
+ echo "else"
+ echo "${name_}_LDADD = \${GEN_GCJ_LDADD_LIST}"
+ echo "endif"
case "${name}" in
*dir/* )
- # set during non-standard builds such as RHEL 4.
- echo "${name_}_LDFLAGS += \${GEN_${GEN_UBASENAME}_RPATH_FLAGS}"
- ;;
+ # set during non-standard builds such as RHEL 4.
+ echo "${name_}_LDFLAGS += \${GEN_${GEN_UBASENAME}_RPATH_FLAGS}"
+ ;;
* )
- echo "${name_}_LDFLAGS += \$(GEN_GCJ_BUILDTREE_RPATH_FLAGS)"
- ;;
+ echo "${name_}_LDFLAGS += \$(GEN_GCJ_BUILDTREE_RPATH_FLAGS)"
+ ;;
esac
echo "${name_}_LDFLAGS += \${GEN_GCJ_NO_SIGCHLD_FLAGS}"
}
@@ -451,7 +456,6 @@ ${sources} += ${GEN_SOURCENAME}/JUnitTests.java
endif
BUILT_SOURCES += ${GEN_SOURCENAME}/JUnitTests.java
SCRIPT_BUILT += ${GEN_SOURCENAME}/JUnitTests.java
-TestRunner_LDADD = \${LIBJUNIT} \${GEN_GCJ_LDADD_LIST}
TESTS += TestRunner
noinst_PROGRAMS += TestRunner
EOF
@@ -491,7 +495,6 @@ for suffix in .java .java-sh .mkenum .shenum .java-in ; do
echo "${name_}_SOURCES ="
echo "${name_}_LINK = \$(GCJLINK) \$(${name_}_LDFLAGS)"
echo_LDFLAGS ${name}
- echo "${name_}_LDADD = \$(GEN_GCJ_LDADD_LIST)"
fi
done || exit 1
done
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 1852afc..f52d92c 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -94,8 +94,6 @@ empty=
space=$(empty) $(empty)
JAVAROOT = classes
-GEN_GCC_BUILDTREE_RPATHS = $(top_builddir)/elfutils/libdw
-
# The list of libraries for the GCJ programs is different to that of
# the standalone .c programs. Accumulate the GCJ list in
# GEN_GCJ_LDADD_LIST.
@@ -133,6 +131,7 @@ GEN_GCJ_BUILDTREE_RPATHS = \
))
GEN_GCJ_BUILDTREE_RPATH = \
$(subst $(space),:,$(sort $(GEN_GCJ_BUILDTREE_RPATHS)))
+GEN_GCC_BUILDTREE_RPATHS = $(top_builddir)/elfutils/libdw
GEN_GCJ_BUILDTREE_RPATH_FLAGS = \
-Djava.library.path=$(GEN_GCJ_BUILDTREE_RPATH) \
-Wl,-rpath,$(GEN_GCJ_BUILDTREE_RPATH):$(GEN_GCC_BUILDTREE_RPATHS)
hooks/post-receive
--
frysk system monitor/debugger
reply other threads:[~2007-11-26 18:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071126183834.22305.qmail@sourceware.org \
--to=cagney@sourceware.org \
--cc=frysk-cvs@sourceware.org \
--cc=frysk@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).