From ed0db39f6d4ca3c1a4f1196f001153dab04acbf8 Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@apple.com>
Date: Fri, 30 Sep 2005 23:43:07 +0000
Subject: [PATCH] Makefile.in (LIPO_FOR_TARGET): Define.

	* Makefile.in (LIPO_FOR_TARGET): Define.
	(STRIP_FOR_TARGET): Define.

From-SVN: r104840
---
 gcc/ChangeLog   |  3 +++
 gcc/Makefile.in | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9baa569fa21..34561df2e8b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -12,6 +12,9 @@
 
 2005-09-30  Geoffrey Keating  <geoffk@apple.com>
 
+	* Makefile.in (LIPO_FOR_TARGET): Define.
+	(STRIP_FOR_TARGET): Define.
+
 	* config/t-slibgcc-darwin (libgcc_s_%.dylib): Remove old symlinks
 	before creating new ones.  Do symlinks before creating the actual
 	targets.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index cd6533babcb..027fa043e11 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -344,6 +344,7 @@ AR_FOR_TARGET := $(shell \
 AR_FLAGS_FOR_TARGET =
 AR_CREATE_FOR_TARGET = $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) rc
 AR_EXTRACT_FOR_TARGET = $(AR_FOR_TARGET) $(AR_FLAGS_FOR_TARGET) x
+LIPO_FOR_TARGET = lipo
 ORIGINAL_AS_FOR_TARGET = @ORIGINAL_AS_FOR_TARGET@
 RANLIB_FOR_TARGET := $(shell \
   if [ -f $(objdir)/../binutils/ranlib ] ; then \
@@ -358,6 +359,16 @@ RANLIB_FOR_TARGET := $(shell \
 ORIGINAL_LD_FOR_TARGET = @ORIGINAL_LD_FOR_TARGET@
 ORIGINAL_NM_FOR_TARGET = @ORIGINAL_NM_FOR_TARGET@
 NM_FOR_TARGET = ./nm
+STRIP_FOR_TARGET := $(shell \
+  if [ -f $(objdir)/../binutils/strip ] ; then \
+    echo $(objdir)/../binutils/strip ; \
+  else \
+    if [ "$(host)" = "$(target)" ] ; then \
+      echo strip; \
+    else \
+       t='$(program_transform_name)'; echo strip | sed -e $$t ; \
+    fi; \
+  fi)
 
 # --------
 # UNSORTED