]> git.ipfire.org Git - thirdparty/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)
committerCole Robinson <crobinso@redhat.com>
Tue, 28 Apr 2015 15:06:43 +0000 (11:06 -0400)
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>
(cherry picked from commit 237ffd1b1d725f04b3b185ee2cb5938b6d3d45b7)

src/Makefile.am

index 629df5ea7734539f7c0751672c3051504d213599..c2e1947d40af7694041cf28ef7704ac645fb6a3d 100644 (file)
@@ -1035,10 +1035,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