sys-devel/llvm: Respect toolchain-funcs pkg-config override, #600622

diff --git a/sys-devel/llvm/llvm-3.4.2-r100.ebuild b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
index 97394372a2ddfe15be8a8a4df395e2ac8f70d56f..56a9d131e6e0e38afabfc803704ebcda5ccb179c 100644 (file)
--- a/sys-devel/llvm/llvm-3.4.2-r100.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2-r100.ebuild
@@ -174,7 +174,7 @@ multilib_src_configure() {
 
        if use libffi; then
                local CPPFLAGS=${CPPFLAGS}
-               append-cppflags "$(pkg-config --cflags libffi)"
+               append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)"
        fi
 
        # llvm prefers clang over gcc, so we may need to force that

diff --git a/sys-devel/llvm/llvm-3.5.2.ebuild b/sys-devel/llvm/llvm-3.5.2.ebuild
index 303f969e92527d2596c05e52752f07c65712eabc..762055be933aab193c27714c1389f29ec7ea0c2c 100644 (file)
--- a/sys-devel/llvm/llvm-3.5.2.ebuild
+++ b/sys-devel/llvm/llvm-3.5.2.ebuild
@@ -259,7 +259,7 @@ multilib_src_configure() {
 
        if use libffi; then
                local CPPFLAGS=${CPPFLAGS}
-               append-cppflags "$(pkg-config --cflags libffi)"
+               append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)"
        fi
 
        # llvm prefers clang over gcc, so we may need to force that

diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild
index 5c2cbb215b7c616a8d31d6ee80506f30640c63cd..9cd430212f192ffced33da76b30bc85092d28af2 100644 (file)
--- a/sys-devel/llvm/llvm-3.6.2.ebuild
+++ b/sys-devel/llvm/llvm-3.6.2.ebuild
@@ -266,7 +266,7 @@ multilib_src_configure() {
 
        if use libffi; then
                local CPPFLAGS=${CPPFLAGS}
-               append-cppflags "$(pkg-config --cflags libffi)"
+               append-cppflags "$($(tc-getPKG_CONFIG) --cflags libffi)"
        fi
 
        # Enable large file support, bug #550708

diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index af7dce6733335022b2362631944e3e1511c0c8e7..ac91baf3d437285cf6c8d2dd054702a40b59eaf0 100644 (file)
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -275,8 +275,8 @@ multilib_src_configure() {
 
        local ffi_cflags ffi_ldflags
        if use libffi; then
-               ffi_cflags=$(pkg-config --cflags-only-I libffi)
-               ffi_ldflags=$(pkg-config --libs-only-L libffi)
+               ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+               ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
        fi
 
        local libdir=$(get_libdir)

diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index 439485f9cb7107a3a43a40223128de6ac0d1956d..53dd9100947ce675f56438f2089e1197d8ce183c 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -280,8 +280,8 @@ multilib_src_configure() {
 
        local ffi_cflags ffi_ldflags
        if use libffi; then
-               ffi_cflags=$(pkg-config --cflags-only-I libffi)
-               ffi_ldflags=$(pkg-config --libs-only-L libffi)
+               ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+               ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
        fi
 
        local libdir=$(get_libdir)

diff --git a/sys-devel/llvm/llvm-3.8.1.ebuild b/sys-devel/llvm/llvm-3.8.1.ebuild
index de7426a24fcca5b5658ed852f0c778dbbf8a997c..07d910bf3ef0c0f30fe661178ffa278f15ebb3d2 100644 (file)
--- a/sys-devel/llvm/llvm-3.8.1.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1.ebuild
@@ -265,8 +265,8 @@ multilib_src_configure() {
 
        local ffi_cflags ffi_ldflags
        if use libffi; then
-               ffi_cflags=$(pkg-config --cflags-only-I libffi)
-               ffi_ldflags=$(pkg-config --libs-only-L libffi)
+               ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+               ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
        fi
 
        local libdir=$(get_libdir)

diff --git a/sys-devel/llvm/llvm-3.9.0-r1.ebuild b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
index 7faa108802b4c20d37d1872378076c4bb6c1de01..23505b9587dbe9b9807f1b06057e121d2d3e9aa5 100644 (file)
--- a/sys-devel/llvm/llvm-3.9.0-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.0-r1.ebuild
@@ -259,8 +259,8 @@ src_prepare() {
 multilib_src_configure() {
        local ffi_cflags ffi_ldflags
        if use libffi; then
-               ffi_cflags=$(pkg-config --cflags-only-I libffi)
-               ffi_ldflags=$(pkg-config --libs-only-L libffi)
+               ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+               ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
        fi
 
        local libdir=$(get_libdir)

diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index a89a1d219826d37aade83ce848ee27f494252de0..94c3a7d6e596f5b3a96dc0fb6f9deb9c2ea0c06d 100644 (file)
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -133,8 +133,8 @@ src_prepare() {
 multilib_src_configure() {
        local ffi_cflags ffi_ldflags
        if use libffi; then
-               ffi_cflags=$(pkg-config --cflags-only-I libffi)
-               ffi_ldflags=$(pkg-config --libs-only-L libffi)
+               ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
+               ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
        fi
 
        local libdir=$(get_libdir)