diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:14:01 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-23 00:37:11 +0200 |
| commit | d2f62c32e01e186f3cc0ffe7f9341be86d7f42b5 (patch) | |
| tree | 387c8c37ac738a78d0ab437e207bc34188f8c488 /RepositoryExternal.mk | |
| parent | 52004a886bedd97944c5c723afcae9b44292349d (diff) | |
nss: use libraries from WORKDIR
Change-Id: I120fdbd32d3c20df7f2c6f67e0df6de216606396
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index d43be9f38f4c..764f98845126 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2254,8 +2254,10 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(OUTDIR)/inc/mozilla \ ) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ +) $(call gb_LinkTarget_use_libraries,$(1),\ - nspr4 \ xpcom \ xpcom_core \ ) @@ -2639,27 +2641,48 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \ ) -$(call gb_LinkTarget_use_libraries,$(1),\ - nspr4 \ - nss3 \ - smime3 \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nspr4.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/nss3.lib \ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/smime3.lib \ +) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib \ + -lnspr4 \ + -lnss3 \ + -lsmime3 \ ) +endif endef define gb_LinkTarget__use_plc4 $(call gb_LinkTarget_use_package,$(1),nss) -$(call gb_LinkTarget_use_libraries,$(1),\ - plc4 \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/plc4.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lplc4 \ +) +endif endef define gb_LinkTarget__use_ssl3 $(call gb_LinkTarget_use_package,$(1),nss) -$(call gb_LinkTarget_use_libraries,$(1),\ - ssl3 \ +ifeq ($(COM),MSC) +$(call gb_LinkTarget_add_libs,$(1),\ + $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/ssl3.lib \ ) +else +$(call gb_LinkTarget_add_libs,$(1),\ + -L$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib -lssl3 \ +) +endif endef |