authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-08-28 03:31:57-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2017-08-28 03:31:57-04:00
log6c7e975b75435274f3670f220789b36e604f5483
tree4bf857925b419d228a52f48dfa00ba7d77857f1d
parente6b7b8a0706aad320d2f4f24951a70468477d8a0

remove remnants of depending on darwin system linker

6 files changed, 0 insertions(+), 36 deletions(-)

CMakeLists.txt-20
...@@ -197,26 +197,6 @@ set(ZIG_SOURCES...@@ -197,26 +197,6 @@ set(ZIG_SOURCES
197 "${CMAKE_SOURCE_DIR}/src/zig_llvm.cpp"197 "${CMAKE_SOURCE_DIR}/src/zig_llvm.cpp"
198)198)
199199
200set(ZIG_HOST_LINK_VERSION)
201if (APPLE)
202 set(LD_V_OUTPUT)
203 execute_process(
204 COMMAND sh -c "${CMAKE_LINKER} -v 2>&1 | head -1"
205 RESULT_VARIABLE HAD_ERROR
206 OUTPUT_VARIABLE LD_V_OUTPUT
207 )
208 if (NOT HAD_ERROR)
209 if ("${LD_V_OUTPUT}" MATCHES ".*ld64-([0-9.]+).*")
210 string(REGEX REPLACE ".*ld64-([0-9.]+).*" "\\1" ZIG_HOST_LINK_VERSION ${LD_V_OUTPUT})
211 elseif ("${LD_V_OUTPUT}" MATCHES "[^0-9]*([0-9.]+).*")
212 string(REGEX REPLACE "[^0-9]*([0-9.]+).*" "\\1" ZIG_HOST_LINK_VERSION ${LD_V_OUTPUT})
213 endif()
214 else()
215 message(FATAL_ERROR "${CMAKE_LINKER} failed with status ${HAD_ERROR}")
216 endif()
217endif()
218
219
220set(C_HEADERS_DEST "lib/zig/include")200set(C_HEADERS_DEST "lib/zig/include")
221set(ZIG_STD_DEST "lib/zig/std")201set(ZIG_STD_DEST "lib/zig/std")
222set(CONFIGURE_OUT_FILE "${CMAKE_BINARY_DIR}/config.h")202set(CONFIGURE_OUT_FILE "${CMAKE_BINARY_DIR}/config.h")
src/all_types.hpp-1
...@@ -1465,7 +1465,6 @@ struct CodeGen {...@@ -1465,7 +1465,6 @@ struct CodeGen {
1465 bool windows_subsystem_windows;1465 bool windows_subsystem_windows;
1466 bool windows_subsystem_console;1466 bool windows_subsystem_console;
1467 bool windows_linker_unicode;1467 bool windows_linker_unicode;
1468 Buf *darwin_linker_version;
1469 Buf *mmacosx_version_min;1468 Buf *mmacosx_version_min;
1470 Buf *mios_version_min;1469 Buf *mios_version_min;
1471 bool linker_rdynamic;1470 bool linker_rdynamic;
src/codegen.cpp-6
...@@ -108,7 +108,6 @@ CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out...@@ -108,7 +108,6 @@ CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out
108 g->libc_lib_dir = buf_create_from_str("");108 g->libc_lib_dir = buf_create_from_str("");
109 g->libc_static_lib_dir = buf_create_from_str("");109 g->libc_static_lib_dir = buf_create_from_str("");
110 g->libc_include_dir = buf_create_from_str("");110 g->libc_include_dir = buf_create_from_str("");
111 g->darwin_linker_version = buf_create_from_str("");
112 g->each_lib_rpath = false;111 g->each_lib_rpath = false;
113 } else {112 } else {
114 // native compilation, we can rely on the configuration stuff113 // native compilation, we can rely on the configuration stuff
...@@ -119,7 +118,6 @@ CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out...@@ -119,7 +118,6 @@ CodeGen *codegen_create(Buf *root_src_path, const ZigTarget *target, OutType out
119 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);118 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);
120 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);119 g->libc_static_lib_dir = buf_create_from_str(ZIG_LIBC_STATIC_LIB_DIR);
121 g->libc_include_dir = buf_create_from_str(ZIG_LIBC_INCLUDE_DIR);120 g->libc_include_dir = buf_create_from_str(ZIG_LIBC_INCLUDE_DIR);
122 g->darwin_linker_version = buf_create_from_str(ZIG_HOST_LINK_VERSION);
123#ifdef ZIG_EACH_LIB_RPATH121#ifdef ZIG_EACH_LIB_RPATH
124 g->each_lib_rpath = true;122 g->each_lib_rpath = true;
125#endif123#endif
...@@ -251,10 +249,6 @@ void codegen_set_windows_unicode(CodeGen *g, bool municode) {...@@ -251,10 +249,6 @@ void codegen_set_windows_unicode(CodeGen *g, bool municode) {
251 g->windows_linker_unicode = municode;249 g->windows_linker_unicode = municode;
252}250}
253251
254void codegen_set_mlinker_version(CodeGen *g, Buf *darwin_linker_version) {
255 g->darwin_linker_version = darwin_linker_version;
256}
257
258void codegen_set_mmacosx_version_min(CodeGen *g, Buf *mmacosx_version_min) {252void codegen_set_mmacosx_version_min(CodeGen *g, Buf *mmacosx_version_min) {
259 g->mmacosx_version_min = mmacosx_version_min;253 g->mmacosx_version_min = mmacosx_version_min;
260}254}
src/codegen.hpp-1
...@@ -36,7 +36,6 @@ void codegen_add_lib_dir(CodeGen *codegen, const char *dir);...@@ -36,7 +36,6 @@ void codegen_add_lib_dir(CodeGen *codegen, const char *dir);
36LinkLib *codegen_add_link_lib(CodeGen *codegen, Buf *lib);36LinkLib *codegen_add_link_lib(CodeGen *codegen, Buf *lib);
37void codegen_add_framework(CodeGen *codegen, const char *name);37void codegen_add_framework(CodeGen *codegen, const char *name);
38void codegen_add_rpath(CodeGen *codegen, const char *name);38void codegen_add_rpath(CodeGen *codegen, const char *name);
39void codegen_set_mlinker_version(CodeGen *g, Buf *darwin_linker_version);
40void codegen_set_rdynamic(CodeGen *g, bool rdynamic);39void codegen_set_rdynamic(CodeGen *g, bool rdynamic);
41void codegen_set_mmacosx_version_min(CodeGen *g, Buf *mmacosx_version_min);40void codegen_set_mmacosx_version_min(CodeGen *g, Buf *mmacosx_version_min);
42void codegen_set_mios_version_min(CodeGen *g, Buf *mios_version_min);41void codegen_set_mios_version_min(CodeGen *g, Buf *mios_version_min);
src/config.h.in-1
...@@ -19,7 +19,6 @@...@@ -19,7 +19,6 @@
19#define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR@"19#define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR@"
20#define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR@"20#define ZIG_LIBC_STATIC_LIB_DIR "@ZIG_LIBC_STATIC_LIB_DIR@"
21#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"21#define ZIG_DYNAMIC_LINKER "@ZIG_DYNAMIC_LINKER@"
22#define ZIG_HOST_LINK_VERSION "@ZIG_HOST_LINK_VERSION@"
2322
24#cmakedefine ZIG_EACH_LIB_RPATH23#cmakedefine ZIG_EACH_LIB_RPATH
25#cmakedefine ZIG_LLVM_OLD_CXX_ABI24#cmakedefine ZIG_LLVM_OLD_CXX_ABI
src/main.cpp-7
...@@ -68,7 +68,6 @@ static int usage(const char *arg0) {...@@ -68,7 +68,6 @@ static int usage(const char *arg0) {
68 " -municode (windows) link with unicode\n"68 " -municode (windows) link with unicode\n"
69 " -framework [name] (darwin) link against framework\n"69 " -framework [name] (darwin) link against framework\n"
70 " -mios-version-min [ver] (darwin) set iOS deployment target\n"70 " -mios-version-min [ver] (darwin) set iOS deployment target\n"
71 " -mlinker-version [ver] (darwin) override linker version\n"
72 " -mmacosx-version-min [ver] (darwin) set Mac OS X deployment target\n"71 " -mmacosx-version-min [ver] (darwin) set Mac OS X deployment target\n"
73 " --ver-major [ver] dynamic library semver major version\n"72 " --ver-major [ver] dynamic library semver major version\n"
74 " --ver-minor [ver] dynamic library semver minor version\n"73 " --ver-minor [ver] dynamic library semver minor version\n"
...@@ -199,7 +198,6 @@ int main(int argc, char **argv) {...@@ -199,7 +198,6 @@ int main(int argc, char **argv) {
199 bool mwindows = false;198 bool mwindows = false;
200 bool mconsole = false;199 bool mconsole = false;
201 bool municode = false;200 bool municode = false;
202 const char *mlinker_version = nullptr;
203 bool rdynamic = false;201 bool rdynamic = false;
204 const char *mmacosx_version_min = nullptr;202 const char *mmacosx_version_min = nullptr;
205 const char *mios_version_min = nullptr;203 const char *mios_version_min = nullptr;
...@@ -433,8 +431,6 @@ int main(int argc, char **argv) {...@@ -433,8 +431,6 @@ int main(int argc, char **argv) {
433 target_os = argv[i];431 target_os = argv[i];
434 } else if (strcmp(arg, "--target-environ") == 0) {432 } else if (strcmp(arg, "--target-environ") == 0) {
435 target_environ = argv[i];433 target_environ = argv[i];
436 } else if (strcmp(arg, "-mlinker-version") == 0) {
437 mlinker_version = argv[i];
438 } else if (strcmp(arg, "-mmacosx-version-min") == 0) {434 } else if (strcmp(arg, "-mmacosx-version-min") == 0) {
439 mmacosx_version_min = argv[i];435 mmacosx_version_min = argv[i];
440 } else if (strcmp(arg, "-mios-version-min") == 0) {436 } else if (strcmp(arg, "-mios-version-min") == 0) {
...@@ -632,9 +628,6 @@ int main(int argc, char **argv) {...@@ -632,9 +628,6 @@ int main(int argc, char **argv) {
632 codegen_set_windows_subsystem(g, mwindows, mconsole);628 codegen_set_windows_subsystem(g, mwindows, mconsole);
633 codegen_set_windows_unicode(g, municode);629 codegen_set_windows_unicode(g, municode);
634 codegen_set_rdynamic(g, rdynamic);630 codegen_set_rdynamic(g, rdynamic);
635 if (mlinker_version) {
636 codegen_set_mlinker_version(g, buf_create_from_str(mlinker_version));
637 }
638 if (mmacosx_version_min && mios_version_min) {631 if (mmacosx_version_min && mios_version_min) {
639 fprintf(stderr, "-mmacosx-version-min and -mios-version-min options not allowed together\n");632 fprintf(stderr, "-mmacosx-version-min and -mios-version-min options not allowed together\n");
640 return EXIT_FAILURE;633 return EXIT_FAILURE;