Remove stage2 artifacts from install target

2 files changed, 22 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d636c3778eb0..4a46d9f19465 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Marc Tiehuis <marctiehuis at gmail.com>
 
 pkgname=zig-git
-pkgver=0.2.0r2735.4e23fb7f
+pkgver=0.2.0r2984.dc8bda7e
 pkgrel=1
 pkgdesc="a programming language prioritizing robustness, optimality, and clarity"
 arch=('i686' 'x86_64')
@@ -17,6 +17,7 @@ md5sums=('SKIP')
 prepare() {
     cd "$srcdir/$provides"
     patch -Np1 -i "$srcdir/../force_dynamic_llvm.patch"
+    patch -Np1 -i "$srcdir/../no_stage2_artifacts.patch"
 }
 
 pkgver() {
diff --git a/no_stage2_artifacts.patch b/no_stage2_artifacts.patch
new file mode 100644
index 000000000000..a89edcc58450
--- /dev/null
+++ b/no_stage2_artifacts.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bda57634..52599838 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -254,7 +254,6 @@ else()
+         embedded_lld_wasm
+         embedded_lld_lib
+     )
+-    install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
+ endif()
+ 
+ # No patches have been applied to SoftFloat-3e
+@@ -775,7 +774,6 @@ if(MSVC OR MINGW)
+     target_link_libraries(zig LINK_PUBLIC version)
+ endif()
+ install(TARGETS zig DESTINATION bin)
+-install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}")
+ 
+ foreach(file ${ZIG_C_HEADER_FILES})
+     get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY)