diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-07-23 13:28:19 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-07-23 12:26:11 +0000 |
| commit | 12f3237fb4c16e13882a4d43eb768c18a6da8b0f (patch) | |
| tree | c1463e811b980ea247e7a1a34cff24e1a35f4e1f | |
| parent | 4b0dd76e3aa9d27366fc17a47598ef7aa2c737fa (diff) | |
On PE platforms, set PATH rather than LD_LIBRARY_PATH for installcheck
Windows loads DLLs from PATH.
Change-Id: I96ef61236a615d06f1d667e1ae25f11a10e545da
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/Makefile.am | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 39ade95b..0aaf8dd8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,6 +90,12 @@ unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) -l stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) -ldl $(demanglelib) elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(intl_LDADD) +if NATIVE_PE +ld_path_var = PATH +else +ld_path_var = LD_LIBRARY_PATH +endif + installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \ @@ -98,7 +104,7 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) f=`echo "$$p" | \ sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ for opt in --help --version; do \ - if LD_LIBRARY_PATH=$(DESTDIR)$(libdir) \ + if $(ld_path_var)=$$$(ld_path_var):$(DESTDIR)$(libdir) \ $(DESTDIR)$(bindir)/$$f $$opt > c$${pid}_.out 2> c$${pid}_.err \ && test -n "`cat c$${pid}_.out`" \ && test -z "`cat c$${pid}_.err`"; then :; \ |