aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJere Leppänen <jere.leppanen@nokia.com>2022-10-25 14:20:41 +0300
committerMatias Elo <matias.elo@nokia.com>2022-10-26 12:04:33 +0300
commitd2fb4a48da530d9aa9b3589d25da5eb6be0b46d2 (patch)
tree599efe820dea2e68400f1677c7a53daae0958a26 /test
parent09a30bc08db11ace610362c5cc2c179c97875990 (diff)
Revert "test: misc: in installcheck, work around bug in legacy pkgconfig"
This reverts commit e924ab56a026b584aab1c10f7e7210a77d51bb9f. Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com> Reviewed-by: Matias Elo <matias.elo@nokia.com> Reviewed-by: Carl Wallen <carl.wallen@nokia.com>
Diffstat (limited to 'test')
-rw-r--r--test/miscellaneous/Makefile.am7
1 files changed, 1 insertions, 6 deletions
diff --git a/test/miscellaneous/Makefile.am b/test/miscellaneous/Makefile.am
index 7d7e13fe0..9f9038f87 100644
--- a/test/miscellaneous/Makefile.am
+++ b/test/miscellaneous/Makefile.am
@@ -33,13 +33,8 @@ PROGRAM_static = odp_api_headers_static
installcheck-local: $(PROGRAM_static)
-# pkgconfig-0.27 (centos-7) returns linker options in the wrong order
-if PKGCONFIG_WORKAROUND
-WA_FLAGS = -l:libodphelper.a -l:lib@ODP_LIB_NAME@.a
-endif
-
$(PROGRAM_static): $(srcdir)/$(odp_api_headers_SOURCES)
- $(CC) $(AM_CFLAGS) $(CFLAGS) $^ -o $@ $(WA_FLAGS) \
+ $(CC) $(AM_CFLAGS) $(CFLAGS) $^ -o $@ \
`$(PKGCONFIG) --static libodphelper` `$(PKGCONFIG) --static lib$(ODP_LIB_NAME)`
if ! cross_compile
./$@