diff options
author | Shenghou Ma <minux.ma@gmail.com> | 2013-04-16 13:30:52 -0700 |
---|---|---|
committer | Shenghou Ma <minux.ma@gmail.com> | 2013-04-16 13:30:52 -0700 |
commit | 5acc8202a41c04efc17a8b3e0c8a0b46d62836ef (patch) | |
tree | ff7b911e55372635292b1bcef829f6ef2e50465a /src | |
parent | 112d32ebfb3fd47ddcf0e732f69d76319c2c9e24 (diff) | |
download | go-5acc8202a41c04efc17a8b3e0c8a0b46d62836ef.tar.gz |
cmd/dist, make.bash: pass -mmacosx-version-min=10.6 to gcc on Darwin
Fixes issue 5261.
R=golang-dev, r
CC=golang-dev
https://codereview.appspot.com/8798044
Committer: Rob Pike <r@golang.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/cmd/dist/build.c | 4 | ||||
-rwxr-xr-x | src/make.bash | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c index e94862325..169e5cadd 100644 --- a/src/cmd/dist/build.c +++ b/src/cmd/dist/build.c @@ -622,6 +622,10 @@ install(char *dir) // clang is too smart about unused command-line arguments vadd(&gccargs, "-Qunused-arguments"); } + if(streq(gohostos, "darwin")) { + // golang.org/issue/5261 + vadd(&gccargs, "-mmacosx-version-min=10.6"); + } } islib = hasprefix(dir, "lib") || streq(dir, "cmd/cc") || streq(dir, "cmd/gc"); diff --git a/src/make.bash b/src/make.bash index 8d0f6ebae..10696e765 100755 --- a/src/make.bash +++ b/src/make.bash @@ -111,6 +111,10 @@ case "$GOHOSTARCH" in 386) mflag=-m32;; amd64) mflag=-m64;; esac +if [ "$(uname)" == "Darwin" ]; then + # golang.org/issue/5261 + mflag="$mflag -mmacosx-version-min=10.6" +fi ${CC:-gcc} $mflag -O2 -Wall -Werror -o cmd/dist/dist -Icmd/dist "$DEFGOROOT" cmd/dist/*.c eval $(./cmd/dist/dist env -p) |