From f79e7158c9447da0c89be38f5115be769e85e7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 9 Jan 2018 18:58:21 +0200
Subject: [PATCH] Rename merge_archives.sh for consistency

---
 Dockerfile                             | 2 +-
 build-libcxx.sh                        | 2 +-
 merge_archives.sh => merge-archives.sh | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename merge_archives.sh => merge-archives.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index b0c34f8..c3d24d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@ COPY build-compiler-rt.sh .
 RUN ./build-compiler-rt.sh $TOOLCHAIN_PREFIX 6.0.0
 
 # Build libunwind/libcxxabi/libcxx
-COPY build-libcxx.sh merge_archives.sh ./
+COPY build-libcxx.sh merge-archives.sh ./
 RUN ./build-libcxx.sh $TOOLCHAIN_PREFIX
 
 WORKDIR /build
diff --git a/build-libcxx.sh b/build-libcxx.sh
index 72baf19..7137e68 100755
--- a/build-libcxx.sh
+++ b/build-libcxx.sh
@@ -32,7 +32,7 @@ if [ ! -d libcxx ]; then
 fi
 
 LIBCXX=$(pwd)/libcxx
-MERGE_ARCHIVES=$(pwd)/merge_archives.sh
+MERGE_ARCHIVES=$(pwd)/merge-archives.sh
 
 cd libunwind
 for arch in $ARCHS; do
diff --git a/merge_archives.sh b/merge-archives.sh
similarity index 100%
rename from merge_archives.sh
rename to merge-archives.sh