From 8b44ad2619302012d0a778b1df72c049bbca4115 Mon Sep 17 00:00:00 2001 From: Eric Molitor Date: Sun, 16 Feb 2020 12:19:32 +0000 Subject: main/compiler-rt: Fix compiler-rt install location Alpine currently installs compiler-rt into the following location. [DESTDIR]/lib/clang/[CLANG_VERSION] However, Clang expects compiler-rt to be located at a specific location. [DESTDIR]/lib/clang/[CLANG_VERSION]/lib/[OS] This results in clang on Alpine not being able to use compiler-rt. clang -rtlib=compiler-rt hello.c /usr/bin/ld: cannot find crtbeginS.o: No such file or directory /usr/bin/ld: cannot find /usr/lib/clang/9.0.0/lib/linux/libclang_rt.builtins-x86_64.a: No such file or directory /usr/bin/ld: cannot find /usr/lib/clang/9.0.0/lib/linux/libclang_rt.builtins-x86_64.a: No such file or directory /usr/bin/ld: cannot find crtendS.o: No such file or directory This change corrects the install location and allows clang to use compiler-rt as a runtime library via -rtlib=compiler-rt. --- main/compiler-rt/APKBUILD | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'main/compiler-rt') diff --git a/main/compiler-rt/APKBUILD b/main/compiler-rt/APKBUILD index a95d294a4d1..01fdc2d1ae7 100644 --- a/main/compiler-rt/APKBUILD +++ b/main/compiler-rt/APKBUILD @@ -1,9 +1,10 @@ +# Contributor Eric Molitor # Contributor Travis Tilley # Maintainer: Natanael Copa pkgname=compiler-rt # Note: Update together with llvm. pkgver=9.0.1 -pkgrel=0 +pkgrel=1 _llvmver=${pkgver%%.*} pkgdesc="LLVM compiler-rt runtime libraries" arch="aarch64 armv7 x86 x86_64" @@ -64,10 +65,10 @@ package() { cd "$pkgdir" - mkdir -p usr/lib/clang + mkdir -p usr/lib/clang/$pkgver/lib case "$CARCH" in ppc64le | s390x) ;; - *) mv usr/lib/linux usr/lib/clang/$pkgver;; + *) mv usr/lib/linux usr/lib/clang/$pkgver/lib;; esac } -- cgit v1.2.3