]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
build: fix race when creating the cpu_map.xml symlink
authorAmy Fong <amy.fong@windriver.com>
Mon, 23 Mar 2015 17:44:03 +0000 (13:44 -0400)
committerJán Tomko <jtomko@redhat.com>
Wed, 25 Mar 2015 17:48:00 +0000 (18:48 +0100)
In some circumstances where the build tree differs from the source,
libvirt's compile will try to create the symlink for cpu_map.xml before
creating the directory $(abs_builddir)/cpu:

'src/cpu/cpu_map.xml': No such file or directory'

Do not create the symlink, it is no longer needed after
commit e562e82f
    Load CPU map from builddir when run uninstalled

Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
src/Makefile.am

index 97e060a9f1b7ee58c4d40e2a24108a0bf13a3c7d..91a4c17cbaf4137fe6e05242c48f42b5f262d8fe 100644 (file)
@@ -1037,10 +1037,6 @@ libvirt_la_BUILT_LIBADD += libvirt_cpu.la
 libvirt_cpu_la_CFLAGS = \
                -I$(srcdir)/conf $(AM_CFLAGS)
 libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
-libvirt_cpu_la_DEPENDENCIES = $(abs_builddir)/cpu/cpu_map.xml
-
-$(abs_builddir)/cpu/cpu_map.xml:
-       $(AM_V_GEN)ln -s $(abs_srcdir)/cpu/cpu_map.xml $@
 
 if WITH_VMX
 noinst_LTLIBRARIES += libvirt_vmx.la