From: Ian Jackson Date: Thu, 6 Feb 2014 19:17:26 +0000 (+0000) Subject: libxl: test programs: Fix make race re libxenlight.so X-Git-Tag: 4.4.0-rc4~26 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cde17c6a62d97239c76aace92f3fdbad09931ca4;p=xen.git libxl: test programs: Fix make race re libxenlight.so The test programs were getting the proper libxenlight.so on their link line. Filter it out. Also change the soname of the test library to match the real one, so that libxutil is satisfied with it. Reported-by: Olaf Hering Signed-off-by: Ian Jackson Cc: Olaf Hering Cc: Ian Campbell --- diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 4af90339eb..dab2929b62 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -195,7 +195,7 @@ libxenlight.so.$(MAJOR).$(MINOR): $(LIBXL_OBJS) $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight_test.so: $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight_test.so $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenlight.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LIBXL_LIBS) $(APPEND_LDFLAGS) libxenlight.a: $(LIBXL_OBJS) $(AR) rcs libxenlight.a $^ @@ -216,7 +216,7 @@ xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS)