From: Amy Fong Date: Mon, 23 Mar 2015 17:44:03 +0000 (-0400) Subject: build: fix race when creating the cpu_map.xml symlink X-Git-Tag: v1.2.13.1~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f046531ed3872d7d3581956a64d64005f4fbd047;p=thirdparty%2Flibvirt.git build: fix race when creating the cpu_map.xml symlink 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 Signed-off-by: Ján Tomko (cherry picked from commit 237ffd1b1d725f04b3b185ee2cb5938b6d3d45b7) --- diff --git a/src/Makefile.am b/src/Makefile.am index 629df5ea77..c2e1947d40 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -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