Skip to content

Commit c217f59

Browse files
committedMay 6, 2017
darwin.make-bootstrap-tools.test: fix build breakage
In the extremely unlikely case that our store hash path ends in several digits (as is the case right now), the Darwin ld will try to interpret those digits as a version number and barf. To avoid that, we pass in the SDK version explicitly to stop it from trying to figure it out from iffy context.
1 parent a1748f7 commit c217f59

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed
 

‎pkgs/stdenv/darwin/make-bootstrap-tools.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ in rec {
301301
export flags="-idirafter ${unpack}/include-Libsystem --sysroot=${unpack} -L${unpack}/lib"
302302
303303
export CPP="clang -E $flags"
304-
export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v"
305-
export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v"
304+
export CC="clang $flags -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"
305+
export CXX="clang++ $flags --stdlib=libc++ -lc++abi -isystem${unpack}/include/c++/v1 -Wl,-rpath,${unpack}/lib -Wl,-v -Wl,-sdk_version,10.10"
306306
307307
echo '#include <stdio.h>' >> foo.c
308308
echo '#include <float.h>' >> foo.c

3 commit comments

Comments
 (3)

copumpkin commented on May 6, 2017

@copumpkin
MemberAuthor

matthewbauer commented on May 6, 2017

@matthewbauer
Member

Awesome that this if fixed!

I do hate how many "10.10"s we have barcoded everywhere. Perhaps the new "platform" stuff will give us something "targetPlatform.osVersion"?

copumpkin commented on May 6, 2017

@copumpkin
MemberAuthor

I should really have referred to the environment variable, which I think we do set in the stdenv. Whoops 😄

I guess we can do a search and replace. I don't know anything much about the new platform stuff

Please sign in to comment.