projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* m4/pr40134.m4: Added a configure switch for ARM linker problem.
[cacao.git]
/
src
/
cacao
/
Makefile.am
diff --git
a/src/cacao/Makefile.am
b/src/cacao/Makefile.am
index f338a1b31d17ac3f0d31618cc9b9588d7768b161..34a81cbfbcc2891e912498f4209fa10e1de253d4 100644
(file)
--- a/
src/cacao/Makefile.am
+++ b/
src/cacao/Makefile.am
@@
-38,8
+38,18
@@
libjvm_la_LDFLAGS = \
-avoid-version
if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
-avoid-version
if WITH_JAVA_RUNTIME_LIBRARY_OPENJDK
+if WITH_GNU_LD
libjvm_la_LDFLAGS += \
-Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
libjvm_la_LDFLAGS += \
-Xlinker --version-script=$(top_srcdir)/contrib/mapfile-vers-product
+else
+# This is for the Solaris LD.
+libjvm_la_LDFLAGS += \
+ -Xlinker -M$(top_srcdir)/contrib/mapfile-vers-product
+endif
+endif
+
+if GCC_PR40134
+libjvm_la_LDFLAGS += -lgcc
endif
cacao_LDFLAGS += \
endif
cacao_LDFLAGS += \
@@
-80,7
+90,6
@@
libjvm_la_LIBADD = \
$(top_builddir)/src/threads/libthreads.la \
$(top_builddir)/src/toolbox/libtoolbox.la \
$(top_builddir)/src/vm/libvm.la \
$(top_builddir)/src/threads/libthreads.la \
$(top_builddir)/src/toolbox/libtoolbox.la \
$(top_builddir)/src/vm/libvm.la \
- $(top_builddir)/src/vmcore/libvmcore.la \
$(GC_LIB)
bin_PROGRAMS = \
$(GC_LIB)
bin_PROGRAMS = \