diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-02 09:36:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-02 09:36:18 -0400 |
| commit | c377b21f83f6cc708584bcb4df9aeeb0bf08eca0 (patch) | |
| tree | 2d3ef273e4ae7f4f237a74cce9b949050facf62e /pkgs/os-specific | |
| parent | 3107b4f0187d2470b836e89943b229b6c8cdb098 (diff) | |
| parent | 62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd (diff) | |
| download | nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.tar nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.tar.gz nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.tar.bz2 nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.tar.lz nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.tar.xz nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.tar.zst nixlib-c377b21f83f6cc708584bcb4df9aeeb0bf08eca0.zip | |
Merge pull request #39844 from obsidiansystems/cctools-cleanup
cctools, apple libiconv: Apple clean up for iOS cross
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 10 |
2 files changed, 8 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index d9b3dfb74049..a89f9fdf90ed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -1,14 +1,14 @@ -{ stdenv, appleDerivation }: +{ stdenv, appleDerivation, autoreconfHook }: appleDerivation { - preConfigure = "cd libiconv"; + postUnpack = "sourceRoot=$sourceRoot/libiconv"; postInstall = '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib - install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib + ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs - echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \ + echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \ -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index d8abdc2c6f84..24f21b498aa5 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -108,17 +108,15 @@ let # include_next "unistd.h" #endif EOF - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh - '' + stdenv.lib.optionalString useOld '' + cd cctools + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' autogen.sh ''; # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather # hairy to handle during bootstrap. Perhaps it could be optional? - preConfigure = stdenv.lib.optionalString (!useOld) '' - cd cctools - '' + '' + preConfigure = '' sh autogen.sh ''; |