From d1c96ec229107188aac3c49a7eb4205bae802d6b Mon Sep 17 00:00:00 2001
From: Mark Seaborn <mrs@mythic-beasts.com>
Date: Sun, 22 Feb 2009 11:34:39 +0000
Subject: [PATCH] Combine link-ldso.sh into link-libcso.sh

---
 link-ldso.sh   | 13 -------------
 link-libcso.sh | 12 +++++++++++-
 2 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100755 link-ldso.sh

diff --git a/link-ldso.sh b/link-ldso.sh
deleted file mode 100755
index bf65c77a40..0000000000
--- a/link-ldso.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# This script is a shortcut for building the dynamic linker.
-# It's faster than running make on glibc.
-
-cd build
-../../tools_bin/linux/sdk/nacl-sdk/bin/nacl-gcc \
-    -nostdlib -nostartfiles -shared \
-    -o elf/ld.so			\
-    -Wl,-z,relro -Wl,--hash-style=both -Wl,-z,defs 	\
-    elf/librtld.os -Wl,--version-script=ld.map		\
-    -Wl,-Map,elf/ld.so.map				\
-    -Wl,-soname=ld-linux.so.2 -L../ld
diff --git a/link-libcso.sh b/link-libcso.sh
index 3f4d499de5..bca023e5e9 100755
--- a/link-libcso.sh
+++ b/link-libcso.sh
@@ -1,12 +1,22 @@
 #!/bin/bash
 
-# This script is a shortcut for building libc.so.
+# This script is a shortcut for building libc.so, the dynamic linker,
+# and some other libraries.
 # It's faster than running make on glibc.
 
 set -e
 
 BUILD=build
 
+echo - ld.so
+../tools_bin/linux/sdk/nacl-sdk/bin/nacl-gcc \
+    -nostdlib -nostartfiles -shared \
+    -o $BUILD/elf/ld.so			\
+    -Wl,-z,relro -Wl,--hash-style=both -Wl,-z,defs 	\
+    $BUILD/elf/librtld.os -Wl,--version-script=$BUILD/ld.map		\
+    -Wl,-Map,$BUILD/elf/ld.so.map				\
+    -Wl,-soname=ld-linux.so.2 -Lld
+
 echo - libc_pic.os
 ../tools_bin/linux/sdk/nacl-sdk/bin/nacl-gcc \
     -nostdlib -nostartfiles -r -o $BUILD/libc_pic.os \
-- 
2.11.4.GIT