From: Shenghou Ma <minux.ma@gmail.com>
Date: Fri, 20 Jan 2012 18:34:30 +0000 (-0500)
Subject: libmach: cross compiling support
X-Git-Tag: weekly.2012-01-27~137
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=541978af0a877232587f5e9cd1c51ecc2cfdb58b;p=gostls13.git

libmach: cross compiling support
        We already use GOHOSTOS to represent the host OS that the toolchain
        will be run on, so no need to resort to uname(1) to get that (and
        use uname(1) will make cross-compiling for another host impossible).

R=rsc, golang-dev
CC=golang-dev
https://golang.org/cl/5530050
---

diff --git a/src/libmach/Makefile b/src/libmach/Makefile
index 2a53749c81..7473204de0 100644
--- a/src/libmach/Makefile
+++ b/src/libmach/Makefile
@@ -49,13 +49,13 @@ OFILES=\
 	6obj.$O\
 	8obj.$O\
 
-ifneq ($(GOHOSTOS),windows)
+ifneq ($(GOHOSTOS),)
 OFILES+=\
-	$(shell uname | tr A-Z a-z).$O\
+	$(GOHOSTOS).$O\
 
 else
 OFILES+=\
-	windows.$O\
+	$(shell uname | tr A-Z a-z).$O\
 
 endif