diff options
author | Dan Peebles <thetypesaretoobig@gmail.com> | 2015-02-08 13:36:13 -0500 |
---|---|---|
committer | Dan Peebles <thetypesaretoobig@gmail.com> | 2015-02-08 21:15:22 -0500 |
commit | 7bea6aafae10731b53e2f8b9a66d6488a3a9f54a (patch) | |
tree | edbf71a01d9ade05059235ec4c16829317554c55 /pkgs/build-support/cc-wrapper/setup-hook.sh | |
parent | c165f24208d770713934c0cd943255d54a73d35c (diff) | |
download | nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.tar nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.tar.gz nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.tar.bz2 nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.tar.lz nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.tar.xz nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.tar.zst nixpkgs-7bea6aafae10731b53e2f8b9a66d6488a3a9f54a.zip |
Some cc-wrapper changes to better support darwin and clang:
- Add a conditional flag for the c++ std lib - Build binaries that get linked by our own dyld (someday) - Automatically add framework directories in the setup hook
Diffstat (limited to 'pkgs/build-support/cc-wrapper/setup-hook.sh')
-rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index e23d7f4cf12..648afda6ebb 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -12,6 +12,10 @@ addCVars () { if [ -d $1/lib ]; then export NIX_LDFLAGS+=" -L$1/lib" fi + + if test -d $1/Library/Frameworks; then + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -F$1/Library/Frameworks" + fi } envHooks+=(addCVars) |