Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Oct 2016 21:29:59 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r307690 - head
Message-ID:  <201610202129.u9KLTxcu002806@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Thu Oct 20 21:29:59 2016
New Revision: 307690
URL: https://svnweb.freebsd.org/changeset/base/307690

Log:
  Don't build libssp as a prereq lib if WITHOUT_SSP is set
  
  Reviewed by:	brooks
  Differential Revision:	https://reviews.freebsd.org/D8301

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Oct 20 21:12:50 2016	(r307689)
+++ head/Makefile.inc1	Thu Oct 20 21:29:59 2016	(r307690)
@@ -1983,7 +1983,10 @@ libraries: .MAKE .PHONY
 #
 # static libgcc.a prerequisite for shared libc
 #
-_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt
+_prereq_libs= gnu/lib/libgcc lib/libcompiler_rt
+.if ${MK_SSP} != "no"
+_prereq_libs+= gnu/lib/libssp/libssp_nonshared
+.endif
 
 # These dependencies are not automatically generated:
 #



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610202129.u9KLTxcu002806>