summaryrefslogtreecommitdiffstats
path: root/lib/csu
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-09-21 21:44:02 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-09-21 21:44:02 +0000
commit22c9fba62b50f6549a93e3c1cf8f553595c85317 (patch)
tree96c2f43425bd7fd31d443b4719f933f4a0dd0396 /lib/csu
parent5b14fc7575c0967a6f156a4064797074509955b3 (diff)
downloadFreeBSD-src-22c9fba62b50f6549a93e3c1cf8f553595c85317.zip
FreeBSD-src-22c9fba62b50f6549a93e3c1cf8f553595c85317.tar.gz
Fix installation of 32bit libraries after r288074.
FILES is not used when LIBRARIES_ONLY is set, which is used to build and install the lib32 sysroot. All of the csu files do quality as "libraries" for this case so just undefine LIBRARIES_ONLY. This is still better than the previous realinstall handling as it does not hook into META_MODE properly. Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'lib/csu')
-rw-r--r--lib/csu/aarch64/Makefile2
-rw-r--r--lib/csu/amd64/Makefile2
-rw-r--r--lib/csu/arm/Makefile2
-rw-r--r--lib/csu/i386/Makefile2
-rw-r--r--lib/csu/mips/Makefile2
-rw-r--r--lib/csu/powerpc/Makefile2
-rw-r--r--lib/csu/powerpc64/Makefile2
-rw-r--r--lib/csu/sparc64/Makefile2
8 files changed, 16 insertions, 0 deletions
diff --git a/lib/csu/aarch64/Makefile b/lib/csu/aarch64/Makefile
index 65284ae..9747619 100644
--- a/lib/csu/aarch64/Makefile
+++ b/lib/csu/aarch64/Makefile
@@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile
index d293534..e9ca6b9 100644
--- a/lib/csu/amd64/Makefile
+++ b/lib/csu/amd64/Makefile
@@ -14,6 +14,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile
index 65284ae..9747619 100644
--- a/lib/csu/arm/Makefile
+++ b/lib/csu/arm/Makefile
@@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile
index 01fe0d8..d64f803 100644
--- a/lib/csu/i386/Makefile
+++ b/lib/csu/i386/Makefile
@@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS} crt1_c.o crt1_s.o gcrt1_c.o Scrt1_c.o
CLEANFILES+= crt1_c.s gcrt1_c.s Scrt1_c.s
diff --git a/lib/csu/mips/Makefile b/lib/csu/mips/Makefile
index 65284ae..9747619 100644
--- a/lib/csu/mips/Makefile
+++ b/lib/csu/mips/Makefile
@@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile
index 65284ae..9747619 100644
--- a/lib/csu/powerpc/Makefile
+++ b/lib/csu/powerpc/Makefile
@@ -13,6 +13,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile
index fab7c5d..09b643e 100644
--- a/lib/csu/powerpc64/Makefile
+++ b/lib/csu/powerpc64/Makefile
@@ -21,6 +21,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
CLEANFILES+= crt1.s gcrt1.s Scrt1.s
diff --git a/lib/csu/sparc64/Makefile b/lib/csu/sparc64/Makefile
index 2680789..0074cb9 100644
--- a/lib/csu/sparc64/Makefile
+++ b/lib/csu/sparc64/Makefile
@@ -12,6 +12,8 @@ FILESMODE= ${LIBMODE}
FILESOWN= ${LIBOWN}
FILESGRP= ${LIBGRP}
FILESDIR= ${LIBDIR}
+# These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
+.undef LIBRARIES_ONLY
CLEANFILES= ${OBJS}
OpenPOWER on IntegriCloud