summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Ross <gordon.w.ross@gmail.com>2016-10-31 20:14:33 -0400
committerGordon Ross <gordon.w.ross@gmail.com>2016-10-31 20:14:33 -0400
commit642cad6ee1638a190480e94aae12c7de16e79e4d (patch)
treef5a7c9a32cf812cd928574a8422e747f1e927379
parent92ab759e87dfb1a7e027d7537b7bcfe20ef7b106 (diff)
downloadillumos-gfx-drm-642cad6ee1638a190480e94aae12c7de16e79e4d.tar.gz
Update Makefile.master.64 from illumos-gate
Fixes missing LDLIBS64 settings.
-rw-r--r--usr/src/Makefile.master.6412
1 files changed, 1 insertions, 11 deletions
diff --git a/usr/src/Makefile.master.64 b/usr/src/Makefile.master.64
index 4974b1d..f671406 100644
--- a/usr/src/Makefile.master.64
+++ b/usr/src/Makefile.master.64
@@ -43,24 +43,14 @@ CTF_FLAGS= $(CTF_FLAGS_64)
OFFSETS_CREATE= $(OFFSETS_CREATE64)
#
-# Some library path hackery, to allow building of partial workspaces
-# and properly set the 64-bit library paths with 'ws'
-#
-LDLIBS1= $(ENVLDLIBS1:%=%/$(MACH64))
-LDLIBS2= $(ENVLDLIBS2:%=%/$(MACH64))
-LDLIBS3= $(ENVLDLIBS3:%=%/$(MACH64))
-LDLIBS64 = $(LDLIBS1) $(LDLIBS2) $(LDLIBS3)
-
-#
# Moved these up to the top level here, so they can be overridden
#
LDLIBS.cmd = $(LDLIBS64)
LDLIBS.lib = $(LDLIBS64)
#
-# Override Makefile.master's settings of SFWLIBDIR and GCCLIBDIR
+# Override Makefile.master's settings of GCCLIBDIR
#
-SFWLIBDIR= $(SFWLIBDIR64)
GCCLIBDIR= $(GCCLIBDIR64)
#