瀏覽代碼

x/sys/unix: use xcrun to find OS X and iOS SDKs in mkall.sh.

This makes the script resistant to changes in the SDK location, which
apparently happens from time to time.

While I was at it, made another cosmetic touch-up: use a .gitignore file
to stop `git status` from showing the _obj/ directory generated by
mkall.sh.

Change-Id: Ia706114d94e324ab443f6f5d6aa7c0c9f8a84620
Reviewed-on: https://go-review.googlesource.com/14192
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Aaron Jacobs 10 年之前
父節點
當前提交
2ac7e53520
共有 3 個文件被更改,包括 5 次插入4 次删除
  1. 1 0
      unix/.gitignore
  2. 3 3
      unix/mkall.sh
  3. 1 1
      unix/zsysnum_darwin_arm64.go

+ 1 - 0
unix/.gitignore

@@ -0,0 +1 @@
+_obj/

+ 3 - 3
unix/mkall.sh

@@ -116,12 +116,12 @@ _* | *_ | _)
 darwin_386)
 darwin_386)
 	mkerrors="$mkerrors -m32"
 	mkerrors="$mkerrors -m32"
 	mksyscall="./mksyscall.pl -l32"
 	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 	;;
 darwin_amd64)
 darwin_amd64)
 	mkerrors="$mkerrors -m64"
 	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 	;;
 darwin_arm)
 darwin_arm)
@@ -131,7 +131,7 @@ darwin_arm)
 	;;
 	;;
 darwin_arm64)
 darwin_arm64)
 	mkerrors="$mkerrors -m64"
 	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sys/syscall.h"
+	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
 	;;
 	;;
 dragonfly_386)
 dragonfly_386)

+ 1 - 1
unix/zsysnum_darwin_arm64.go

@@ -1,4 +1,4 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/sys/syscall.h
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/include/sys/syscall.h
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 // MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
 
 
 // +build arm64,darwin
 // +build arm64,darwin