Add a symlink to base libgcc.a in rust libraries subdir, so that

clang/rust finds it when linking some rust code - somewhat needed by
stylo (the css engine written in rust within mozilla). Modeled after
what is done in lang/g77.

From semarie@, who discussed it with espie@.
This commit is contained in:
landry 2017-05-18 06:39:49 +00:00
parent 3292d677d9
commit 8684e41af8
3 changed files with 14 additions and 3 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2017/05/05 11:40:29 landry Exp $
# $OpenBSD: Makefile,v 1.43 2017/05/18 06:39:49 landry Exp $
# snapshots are only available for amd64 and i386, for now
ONLY_FOR_ARCHS = amd64 i386
@ -9,6 +9,7 @@ COMMENT-main = compiler for Rust Language
COMMENT-doc = html documentation for rustc
V = 1.17.0
REVISION = 0
DISTNAME = rustc-${V}-src
# rustc bootstrap version
@ -73,6 +74,11 @@ MODPY_RUNDEP = No
BUILD_DEPENDS += devel/llvm \
devel/cmake
# libgcc.a path
CONFIG = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
SYSV = 4.2.1
SYSLIBPATH = /usr/lib/gcc-lib/${CONFIG}/${SYSV}
# rustllvm need c++11
MODGCC4_LANGS = c++
MODGCC4_ARCHS = * # patches required for base clang
@ -183,6 +189,9 @@ post-install:
${PREFIX}/lib/rustlib/{install.log,uninstall.sh,rust-installer-version} \
${PREFIX}/lib/rustlib/components \
${PREFIX}/lib/rustlib/manifest-*
# make a link to libgcc.a inside rustlib
ln -fs ${SYSLIBPATH}/libgcc.a \
${PREFIX}/lib/rustlib/${TRIPLE_ARCH}/lib
do-test:
${BUILD_BIN} test --verbose --jobs=${MAKE_JOBS} ${TEST_TARGET}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.amd64-main,v 1.3 2017/05/05 11:40:29 landry Exp $
@comment $OpenBSD: PFRAG.amd64-main,v 1.4 2017/05/18 06:39:49 landry Exp $
lib/libarena-c0070d826ea43729.so
lib/libflate-f8dd427e4b8c5b4c.so
lib/libfmt_macros-448396db99515941.so
@ -47,6 +47,7 @@ lib/rustlib/x86_64-unknown-openbsd/lib/libcompiler_builtins-1007440a91fdcd3f.rli
lib/rustlib/x86_64-unknown-openbsd/lib/libcore-082780785615d424.rlib
lib/rustlib/x86_64-unknown-openbsd/lib/libflate-f8dd427e4b8c5b4c.so
lib/rustlib/x86_64-unknown-openbsd/lib/libfmt_macros-448396db99515941.so
lib/rustlib/x86_64-unknown-openbsd/lib/libgcc.a
lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-dd68a95b56420ce2.rlib
lib/rustlib/x86_64-unknown-openbsd/lib/libgetopts-dd68a95b56420ce2.so
lib/rustlib/x86_64-unknown-openbsd/lib/libgraphviz-0c715aa7b22d8559.so

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.i386-main,v 1.3 2017/05/05 11:40:29 landry Exp $
@comment $OpenBSD: PFRAG.i386-main,v 1.4 2017/05/18 06:39:49 landry Exp $
lib/libarena-ddd2afc9bf37e63e.so
lib/libflate-b7e6eb08021d17dd.so
lib/libfmt_macros-52ed932153d68799.so
@ -47,6 +47,7 @@ lib/rustlib/i686-unknown-openbsd/lib/libcompiler_builtins-21a69531bc6e2b00.rlib
lib/rustlib/i686-unknown-openbsd/lib/libcore-84e6a2caa4fb3d55.rlib
lib/rustlib/i686-unknown-openbsd/lib/libflate-b7e6eb08021d17dd.so
lib/rustlib/i686-unknown-openbsd/lib/libfmt_macros-52ed932153d68799.so
lib/rustlib/i686-unknown-openbsd/lib/libgcc.a
lib/rustlib/i686-unknown-openbsd/lib/libgetopts-8af7689ae63241f7.rlib
lib/rustlib/i686-unknown-openbsd/lib/libgetopts-8af7689ae63241f7.so
lib/rustlib/i686-unknown-openbsd/lib/libgraphviz-b32814278f223978.so