From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 10 Jan 2014 05:08:10 +0000 (-0800)
Subject: pspp-convert: Fix Mac OS build by eliminating redundant linking.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fbuilds%2F20140113030503%2Fpspp;p=pspp

pspp-convert: Fix Mac OS build by eliminating redundant linking.

The Mach-O object format used on Mac OS handles redundant linking against
a shared object badly, whereas ELF doesn't have a problem, so this commit
fixes a crash on Mac OS.

Reported by Jeremy Lavergne.
---

diff --git a/utilities/automake.mk b/utilities/automake.mk
index 5a44ff825c..101c7cfd6d 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -10,7 +10,4 @@ bin_PROGRAMS += utilities/pspp-convert
 dist_man_MANS += utilities/pspp-convert.1
 utilities_pspp_convert_SOURCES = utilities/pspp-convert.c
 utilities_pspp_convert_CPPFLAGS = $(AM_CPPFLAGS) -DINSTALLDIR=\"$(bindir)\"
-utilities_pspp_convert_LDADD = \
-	src/libpspp/liblibpspp.la \
-	src/libpspp-core.la \
-	gl/libgl.la
+utilities_pspp_convert_LDADD = src/libpspp-core.la