aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lang/icc/Makefile5
-rw-r--r--lang/icc/pkg-plist1
2 files changed, 5 insertions, 1 deletions
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index cd7b248eb23f..7fade79427e7 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= icc
PORTVERSION= 8.1.026
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang linux devel
MASTER_SITES=
DISTNAME= l_cc_pc_${PORTVERSION:C/p.+$//}
@@ -219,6 +219,9 @@ do-build:
.for file in crtbegin.o crtend.o libgcc.a
@cd ${WRKSRC}/opt/${COMPILERDIR}/lib && ${LN} -s /usr/lib/${file} ${file}
.endfor
+# The static linking case expects a crtbeginT.o. Based upon inspection of
+# /usr/src/contrib/gnu/crtstuff.c it seems it's the same as crtbegin.o.
+ @cd ${WRKSRC}/opt/${COMPILERDIR}/lib && ${LN} -s crtbegin.o crtbeginT.o
do-install:
@cd ${WRKSRC}/opt && ${FIND} . -print | \
diff --git a/lang/icc/pkg-plist b/lang/icc/pkg-plist
index fa00166b5340..b546ebf53b6b 100644
--- a/lang/icc/pkg-plist
+++ b/lang/icc/pkg-plist
@@ -930,6 +930,7 @@
%%COMPILERDIR%%/include/xmmintrin.h
@dirrm %%COMPILERDIR%%/include
%%COMPILERDIR%%/lib/crtbegin.o
+%%COMPILERDIR%%/lib/crtbeginT.o
%%COMPILERDIR%%/lib/crtend.o
%%COMPILERDIR%%/lib/crtxi.o
%%COMPILERDIR%%/lib/crtxn.o