diff options
| author | Jack Lloyd <[email protected]> | 2019-03-27 09:14:06 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-03-27 09:14:06 -0400 |
| commit | 1c6803e9f6da35de07e6f220c93e7d7512e07588 (patch) | |
| tree | 2270e0f81b7a6e23f820033226fd429bcd4c4fb5 /src/build-data | |
| parent | e16e981152236703bdaf482b867fb90c5f1f9f6a (diff) | |
Rename 'darwin' target to 'macos'
Both because that's the more common term, and because iOS/watchOS also
uses the Darwin kernel, but we have a distinct target for mobile.
Diffstat (limited to 'src/build-data')
| -rw-r--r-- | src/build-data/cc/clang.txt | 6 | ||||
| -rw-r--r-- | src/build-data/cc/gcc.txt | 4 | ||||
| -rw-r--r-- | src/build-data/os/macos.txt (renamed from src/build-data/os/darwin.txt) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 4b14d9c4b..0721eb87a 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -30,14 +30,14 @@ visibility_build_flags "-fvisibility=hidden" visibility_attribute '__attribute__((visibility("default")))' <so_link_commands> -darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(INSTALLED_LIB_DIR)/{soname_abi} -current_version {darwin_so_current_ver} -compatibility_version {darwin_so_compat_ver}" +macos -> "$(CXX) -dynamiclib -fPIC -install_name $(INSTALLED_LIB_DIR)/{soname_abi} -current_version {macos_so_current_ver} -compatibility_version {macos_so_compat_ver}" # The default works for GNU ld and several other Unix linkers default -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}" </so_link_commands> <binary_link_commands> -darwin -> "$(LINKER) -headerpad_max_install_names" +macos -> "$(LINKER) -headerpad_max_install_names" linux -> "$(LINKER) -Wl,-rpath=\$$ORIGIN" freebsd -> "$(LINKER) -Wl,-rpath=\$$ORIGIN" default -> "$(LINKER)" @@ -77,7 +77,7 @@ x86_32 -> "-m32" x86_64 -> "-m64" ppc64 -> "-m64" -darwin -> "-stdlib=libc++" +macos -> "-stdlib=libc++" ios -> "-stdlib=libc++" netbsd -> "-D_NETBSD_SOURCE" </mach_abi_linking> diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 7790002a9..595b3634e 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -34,8 +34,8 @@ visibility_attribute '__attribute__((visibility("default")))' # The default works for GNU ld and several other Unix linkers default -> "$(CXX) -shared -fPIC -Wl,-soname,{soname_abi}" -# Darwin, HP-UX and Solaris linkers use different syntax -darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(INSTALLED_LIB_DIR)/{soname_abi}" +# macOS, HP-UX, and Solaris linkers use different syntax +macos -> "$(CXX) -dynamiclib -fPIC -install_name $(INSTALLED_LIB_DIR)/{soname_abi}" hpux -> "$(CXX) -shared -fPIC -Wl,+h,{soname_abi}" solaris -> "$(CXX) -shared -fPIC -Wl,-h,{soname_abi}" diff --git a/src/build-data/os/darwin.txt b/src/build-data/os/macos.txt index 8bd9f6e23..2050853ae 100644 --- a/src/build-data/os/darwin.txt +++ b/src/build-data/os/macos.txt @@ -27,7 +27,7 @@ apple_keychain </target_features> <aliases> -macos +darwin macosx osx </aliases> |