diff options
| author | Ulf Hermann <[email protected]> | 2019-01-30 10:24:44 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2019-08-26 07:50:53 +0000 |
| commit | d2db6ecd9994210e75fb4362d781ec882ec7238a (patch) | |
| tree | de0a6af582218030dcae43ed1a6911756f7527d1 /tests/Makefile.am | |
| parent | 188c2613b3744345e2ba3d4cfd0bcc47b12b74ae (diff) | |
Split the "selfcontained" configure option in twoHEADQtCreator4.15.1QtCreator4.15.0-rc1QtCreator4.15.0-beta2QtCreator4.15.0-beta1QtCreator4.15.0QtCreator4.14.2QtCreator4.14.1QtCreator4.14.0-rc1QtCreator4.14.0-beta2QtCreator4.14.0-beta1QtCreator4.14.0QtCreator4.13.3QtCreator4.13.2QtCreator4.13.1QtCreator4.13.0-rc1QtCreator4.13.0-beta2QtCreator4.13.0-beta1QtCreator4.13.0QtCreator4.12.4QtCreator4.12.3QtCreator4.12.2QtCreator4.12.1QtCreator4.12.0-rc1QtCreator4.12.0-beta2QtCreator4.12.0-beta1QtCreator4.12.0QtCreator4.11.2QtCreator4.11.0-rc1QtCreator4.11.0-beta2QtCreator4.11.0-beta1QtCreator4.11.0master5.04.154.144.134.124.1112.011.010.0
upstream is growing an option to install elf.h. We want to use that.
Change-Id: Ica5bf0cdf281eb17ef29e0e1029662a5a9d875b1
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'tests/Makefile.am')
| -rw-r--r-- | tests/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index d60d6636..4b88e16d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -608,14 +608,12 @@ next_cfi_LDADD = $(libelf) $(libdw) $(libgnu) elfcopy_LDADD = $(libelf) $(libgnu) addsections_LDADD = $(libelf) $(libgnu) -if SELFCONTAINED -# In self contained mode we cannot expect a system elf header. -# Use our own then -system_elf_libelf_test_CPPFLAGS = -I$(top_srcdir)/libelf -else # We want to test the libelf header against the system elf.h header. -# Don't include any -I CPPFLAGS. +# Don't include any -I CPPFLAGS. Except when we install our own elf.h. +if !INSTALL_ELFH system_elf_libelf_test_CPPFLAGS = +else +system_elf_libelf_test_CPPFLAGS = -I$(top_srcdir)/libelf endif if USE_GNULIB system_elf_libelf_test_CPPFLAGS += -I$(top_srcdir)/libgnu -I$(top_builddir)/libgnu |