diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-07-17 11:15:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-17 15:05:17 +0200 |
| commit | 3136c467dcfc3fe457ccc974684333f431f0af61 (patch) | |
| tree | f5c67f37345cba2fa359b4b4eafb464e46a6aec4 /firebird | |
| parent | d1fb8b5dafa64a8fe9d3e2adcacda6bc4090b066 (diff) | |
firebird: pass link options as LDFLAGS
Change-Id: Ieb26e89c4a2aa1df28dc44b393c3130dda0d23dd
Diffstat (limited to 'firebird')
| -rw-r--r-- | firebird/ExternalProject_firebird.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk index 5595498552c6..2f0da6142e40 100644 --- a/firebird/ExternalProject_firebird.mk +++ b/firebird/ExternalProject_firebird.mk @@ -34,9 +34,11 @@ $(call gb_ExternalProject_get_state_target,firebird,build): -I$(call gb_UnpackedTarball_get_dir,icu)/source \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/i18n \ -I$(call gb_UnpackedTarball_get_dir,icu)/source/common \ - ,$(ICU_CPPFLAGS)) \ + ,$(ICU_CPPFLAGS))" \ + && export LDFLAGS=" \ -L$(OUTDIR)/lib \ - -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \ + $(if $(filter NO,$(SYSTEM_BOOST)), \ + -L$(call gb_UnpackedTarball_get_dir,boost)/source/lib)" \ && export LD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \ && export DYLD_LIBRARY_PATH="$(OUTDIR)/lib:$(call gb_UnpackedTarball_get_dir,boost)/source/lib" \ $(if $(filter WNT-MSC,$(OS)-$(COM)), && export PATH="$(PATH):$(shell cygpath $(OUTDIR)/lib):$(shell cygpath $(call gb_UnpackedTarball_get_dir,icu)/source/lib)") \ |