Merge pull request #83180 from matthewbauer/only-add-ldflags-for-macos

bintools: only add macos flags when targeting macOS
2020-05-13 10:34:40 -05:00
parent c10f0a32d2 b0b0a06788
commit d38bad590e
2 changed files with 5 additions and 2 deletions
@@ -36,9 +36,7 @@ in rec {
    export NIX_IGNORE_LD_THROUGH_GCC=1
    export SDKROOT=

-    # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID.
    export MACOSX_DEPLOYMENT_TARGET=${macosVersionMin}
-    export NIX_LDFLAGS+=" -macosx_version_min ${macosVersionMin} -sdk_version ${appleSdkVersion} -no_uuid"

    # Workaround for https://openradar.appspot.com/22671534 on 10.11.
    export gl_cv_func_getcwd_abort_bug=no