Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 5 Apr 2016 21:12:03 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r297591 - head
Message-ID:  <201604052112.u35LC3Ub050331@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Tue Apr  5 21:12:03 2016
New Revision: 297591
URL: https://svnweb.freebsd.org/changeset/base/297591

Log:
  Remove leftover _LDSCRIPTROOT missed in r297270.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/Makefile.inc1
  head/Makefile.libcompat

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Apr  5 20:34:20 2016	(r297590)
+++ head/Makefile.inc1	Tue Apr  5 21:12:03 2016	(r297591)
@@ -450,7 +450,7 @@ LIBCOMPAT= SOFT
 
 WMAKE=		${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
-IMAKEENV=	${CROSSENV:N_LDSCRIPTROOT=*}
+IMAKEENV=	${CROSSENV}
 IMAKE=		${IMAKEENV} ${MAKE} -f Makefile.inc1 \
 		${IMAKE_INSTALL} ${IMAKE_MTREE}
 .if empty(.MAKEFLAGS:M-n)

Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat	Tue Apr  5 20:34:20 2016	(r297590)
+++ head/Makefile.libcompat	Tue Apr  5 21:12:03 2016	(r297591)
@@ -97,7 +97,7 @@ LIBCOMPATWMAKEFLAGS+= CC="${XCC} ${LIBCO
 		MK_TESTS=no
 LIBCOMPATWMAKE+=	${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} \
 			MK_MAN=no MK_HTML=no
-LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*:N_LDSCRIPTROOT=*} \
+LIBCOMPATIMAKE+=	${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
 			MK_TOOLCHAIN=no ${IMAKE_INSTALL} \
 			-DLIBRARIES_ONLY
 



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