From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Thu, 16 Jan 2020 22:05:53 +0000 (+0200)
Subject: libcxx: fix build for x86/64
X-Git-Tag: v21.02.0-rc1~4013
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1322190fd355e6d9c0f37a668a77a14bbfb2c375;p=openwrt%2Fstaging%2Fhauke.git

libcxx: fix build for x86/64

When building libcxx for x86/64, the library is installed in /usr/lib64.
As the install section tries to copy the library from /usr/lib, this
breaks build on x86/64. Override the lib dir suffix to fix this.

Fixes: 856ea2bad3b3 ("libcxx: Add package")
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Acked-by: Rosen Penev <rosenp@gmail.com>
---

diff --git a/package/libs/libcxx/Makefile b/package/libs/libcxx/Makefile
index 53b7f1eaab..8343cbb427 100644
--- a/package/libs/libcxx/Makefile
+++ b/package/libs/libcxx/Makefile
@@ -45,6 +45,7 @@ CMAKE_OPTIONS += \
 	-DLIBCXX_INCLUDE_BENCHMARKS=OFF \
 	-DLIBCXX_INCLUDE_DOCS=OFF \
 	-DLIBCXX_INCLUDE_TESTS=OFF \
+	-DLIBCXX_LIBDIR_SUFFIX="" \
 	-DLIBCXX_STANDALONE_BUILD=ON \
 	-DLIBCXX_HAS_MUSL_LIBC=$(if $(CONFIG_USE_MUSL),ON,OFF)