From owner-svn-src-stable@FreeBSD.ORG  Tue Apr 21 15:47:01 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 2004EA66;
 Tue, 21 Apr 2015 15:47:01 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0DE7818D1;
 Tue, 21 Apr 2015 15:47:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3LFl0Me047904;
 Tue, 21 Apr 2015 15:47:00 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3LFl0wR047903;
 Tue, 21 Apr 2015 15:47:00 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201504211547.t3LFl0wR047903@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 21 Apr 2015 15:47:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281834 - stable/10/usr.bin/sort
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Apr 2015 15:47:01 -0000

Author: garga (ports committer)
Date: Tue Apr 21 15:47:00 2015
New Revision: 281834
URL: https://svnweb.freebsd.org/changeset/base/281834

Log:
  Replace LDFLAGS by LDADD to fix sort build with -DNO_SHARED
  
  Differential Revision:	https://reviews.freebsd.org/D2044
  Reviewed by:	sbruno@
  Approved by:	sbruno@
  Sponsored by:	Netgate

Modified:
  stable/10/usr.bin/sort/Makefile

Modified: stable/10/usr.bin/sort/Makefile
==============================================================================
--- stable/10/usr.bin/sort/Makefile	Tue Apr 21 15:00:49 2015	(r281833)
+++ stable/10/usr.bin/sort/Makefile	Tue Apr 21 15:47:00 2015	(r281834)
@@ -13,10 +13,10 @@ CLEANFILES+= sort.1
 
 .if defined(WITH_THREADS)
 CFLAGS+= -DSORT_THREADS
-LDFLAGS+= -lpthread -lmd
+LDADD+= -lpthread -lmd
 MAN_SUB+= -e 's|%%THREADS%%||g'
 .else
-LDFLAGS+= -lmd
+LDADD+= -lmd
 MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
 .endif