From a62ac732f484b5a94d37e2b17b08cf313e68d329 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 1 Jun 2007 16:18:46 +0000 Subject: [PATCH] Fixed problems when building both a dietlibc and a GNU version of a testsuite program. Previously, the same object file (which was generated by 'diet') was used for both variants and only linking differed for them. This caused problems at least in F7 on PPC platforms. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2545 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- lib_internal/testsuite/Makefile-files | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib_internal/testsuite/Makefile-files b/lib_internal/testsuite/Makefile-files index 597a1d4..9b92856 100644 --- a/lib_internal/testsuite/Makefile-files +++ b/lib_internal/testsuite/Makefile-files @@ -40,6 +40,9 @@ EXTRA_DIST += lib_internal/testsuite/copy-check TESTS_ENVIRONMENT += libinternaltestsuitedir=$(top_builddir)/lib_internal/testsuite +# When building both a GNU and a dietlibc version, set target specific +# CPPFLAGS to enforce separate compilation for both variants + lib_internal_testsuite_command_SOURCES = lib_internal/testsuite/command.c lib_internal_testsuite_command_LDADD = $(LIBINTERNAL_GLIBC) \ $(LIBENSCVECTOR_GLIBC) @@ -52,9 +55,14 @@ lib_internal_testsuite_copy_LDADD = $(LIBINTERNAL_GLIBC) lib_internal_testsuite_isnumber_SOURCES = lib_internal/testsuite/isnumber.c lib_internal_testsuite_isnumber_LDADD = $(LIBINTERNAL) +lib_internal_testsuite_isnumber_CPPFLAGS = $(AM_CPPFLAGS) # see note above lib_internal_testsuite_isnumber_gnu_SOURCES = lib_internal/testsuite/isnumber.c lib_internal_testsuite_isnumber_gnu_LDADD = $(LIBINTERNAL_GLIBC) +lib_internal_testsuite_isnumber_gnu_CPPFLAGS = $(AM_CPPFLAGS) # see note above lib_internal_testsuite_sigbus_SOURCES = lib_internal/testsuite/sigbus.c +lib_internal_testsuite_sigbus_CPPFLAGS = $(AM_CPPFLAGS) # see note above + lib_internal_testsuite_sigbus_gnu_SOURCES = lib_internal/testsuite/sigbus.c +lib_internal_testsuite_sigbus_gnu_CPPFLAGS = $(AM_CPPFLAGS) # see note above -- 1.8.1.5