diff options
| author | David Tardon <dtardon@redhat.com> | 2014-04-26 16:08:07 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-04-26 16:50:37 +0200 |
| commit | 2a71e15589c9d4304b744aadad77f1b8e4925ca2 (patch) | |
| tree | f7d209517809fc6aa63668b6e42324f8c303f68f /RepositoryExternal.mk | |
| parent | 943dedc59c87b15cbccfb7b6b3fc39525de06ff1 (diff) | |
specify linking opts for jawt centrally
Change-Id: Idb8d97d44b16bbe41372d97c46199ec786c38218
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index ccd2f5bc1160..e9031c665ce9 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -762,6 +762,8 @@ endef endif # SYSTEM_CMIS +ifeq ($(ENABLE_JAVA),YES) + ifeq ($(OS)$(COM),WNTGCC) define gb_LinkTarget__use_jawt @@ -772,17 +774,27 @@ $(call gb_LinkTarget_add_ldflags,$(1),\ ) $(call gb_LinkTarget_add_libs,$(1),\ - -ljawt \ + $(JAWTLIB) \ ) endef else # $(OS)$(COM) != WNTGCC -gb_LinkTarget__use_jawt := +define gb_LinkTarget__use_jawt +$(call gb_LinkTarget_add_libs,$(1),\ + $(JAWTLIB) \ +) + +endef endif # $(OS)$(COM) = WNTGCC +else # !ENABLE_JAVA + +gb_LinkTarget__use_jawt := + +endif # ENABLE_JAVA ifneq ($(SYSTEM_LIBATOMIC_OPS),) |