authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-02 15:04:14-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-02 15:04:14-07:00
log7af59c76e40d185ed1a8962c2d5fd0f88680d5a7
treefbd8eeaf799fbea424a546b0ae199ce91a7e70ad
parent5824b15249c8fb42aba5ca347d7dc702a4a00a9f

build: fix libc path finding

8 files changed, 54 insertions(+), 48 deletions(-)

README.md+6-6
...@@ -70,13 +70,13 @@ compromises backward compatibility....@@ -70,13 +70,13 @@ compromises backward compatibility.
7070
71### Debug / Development Build71### Debug / Development Build
7272
73If you have gcc or clang installed, you can find out what `ZIG_LIBC_DIR` should73If you have gcc or clang installed, you can find out what `ZIG_LIBC_LIB_DIR` should
74be set to (example below).74be set to (example below). `ZIG_LIBC_INCLUDE_DIR` likely can be set to `/usr/include`.
7575
76```76```
77mkdir build77mkdir build
78cd build78cd build
79cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_DIR=$(dirname $(dirname $(cc -print-file-name=crt1.o)))79cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd) -DZIG_LIBC_LIB_DIR=$(dirname $(cc -print-file-name=crt1.o)) -DZIG_LIBC_INCLUDE_DIR=/usr/include
80make80make
81make install81make install
82./run_tests82./run_tests
...@@ -84,13 +84,13 @@ make install...@@ -84,13 +84,13 @@ make install
8484
85### Release / Install Build85### Release / Install Build
8686
87Once installed, `ZIG_LIBC_DIR` can be overridden by the `--libc-path` parameter87Once installed, `ZIG_LIBC_LIB_DIR` and `ZIG_LIBC_INCLUDE_DIR` can be overridden
88to the zig binary.88by the `--libc-lib-dir` and `--libc-include-dir` parameters to the zig binary.
8989
90```90```
91mkdir build91mkdir build
92cd build92cd build
93cmake .. -DCMAKE_BUILD_TYPE=Release -DZIG_LIBC_DIR=path/to/libc/dir93cmake .. -DCMAKE_BUILD_TYPE=Release -DZIG_LIBC_LIB_DIR=/some/path -DZIG_LIBC_INCLUDE_DIR=/some/path
94make94make
95sudo make install95sudo make install
96```96```
src/all_types.hpp+2-3
...@@ -1062,9 +1062,8 @@ struct CodeGen {...@@ -1062,9 +1062,8 @@ struct CodeGen {
1062 bool strip_debug_symbols;1062 bool strip_debug_symbols;
1063 bool have_exported_main;1063 bool have_exported_main;
1064 bool link_libc;1064 bool link_libc;
1065 Buf *libc_path;1065 Buf *libc_lib_dir;
1066 Buf *libc_lib_path;1066 Buf *libc_include_dir;
1067 Buf *libc_include_path;
1068 CodeGenBuildType build_type;1067 CodeGenBuildType build_type;
1069 LLVMTargetMachineRef target_machine;1068 LLVMTargetMachineRef target_machine;
1070 LLVMZigDIFile *dummy_di_file;1069 LLVMZigDIFile *dummy_di_file;
src/analyze.cpp+5-13
...@@ -5486,20 +5486,12 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {...@@ -5486,20 +5486,12 @@ bool handle_is_ptr(TypeTableEntry *type_entry) {
5486}5486}
54875487
5488void find_libc_path(CodeGen *g) {5488void find_libc_path(CodeGen *g) {
5489 if (!g->libc_path || buf_len(g->libc_path) == 0) {5489 // later we can handle this better by reporting an error via the normal mechanism
5490 g->libc_path = buf_create_from_str(ZIG_LIBC_DIR);5490 if (!g->libc_lib_dir || buf_len(g->libc_lib_dir) == 0) {
5491 if (!g->libc_path || buf_len(g->libc_path) == 0) {5491 zig_panic("Unable to determine libc lib path. probably need to reconfigure");
5492 // later we can handle this better by reporting an error via the normal mechanism
5493 zig_panic("Unable to determine libc path. You can use `--libc-path`");
5494 }
5495 }
5496 if (!g->libc_lib_path) {
5497 g->libc_lib_path = buf_alloc();
5498 os_path_join(g->libc_path, buf_create_from_str("lib"), g->libc_lib_path);
5499 }5492 }
5500 if (!g->libc_include_path) {5493 if (!g->libc_include_dir || buf_len(g->libc_include_dir) == 0) {
5501 g->libc_include_path = buf_alloc();5494 zig_panic("Unable to determine libc include path. probably need to reconfigure");
5502 os_path_join(g->libc_path, buf_create_from_str("include"), g->libc_include_path);
5503 }5495 }
5504}5496}
55055497
src/codegen.cpp+10-3
...@@ -33,6 +33,9 @@ CodeGen *codegen_create(Buf *root_source_dir) {...@@ -33,6 +33,9 @@ CodeGen *codegen_create(Buf *root_source_dir) {
33 g->next_error_index = 1;33 g->next_error_index = 1;
34 g->error_value_count = 1;34 g->error_value_count = 1;
3535
36 g->libc_lib_dir = buf_create_from_str(ZIG_LIBC_LIB_DIR);
37 g->libc_include_dir = buf_create_from_str(ZIG_LIBC_INCLUDE_DIR);
38
36 return g;39 return g;
37}40}
3841
...@@ -69,8 +72,12 @@ void codegen_set_out_name(CodeGen *g, Buf *out_name) {...@@ -69,8 +72,12 @@ void codegen_set_out_name(CodeGen *g, Buf *out_name) {
69 g->root_out_name = out_name;72 g->root_out_name = out_name;
70}73}
7174
72void codegen_set_libc_path(CodeGen *g, Buf *libc_path) {75void codegen_set_libc_lib_dir(CodeGen *g, Buf *libc_lib_dir) {
73 g->libc_path = libc_path;76 g->libc_lib_dir = libc_lib_dir;
77}
78
79void codegen_set_libc_include_dir(CodeGen *g, Buf *libc_include_dir) {
80 g->libc_include_dir = libc_include_dir;
74}81}
7582
76void codegen_add_lib_dir(CodeGen *g, const char *dir) {83void codegen_add_lib_dir(CodeGen *g, const char *dir) {
...@@ -3710,7 +3717,7 @@ static void generate_h_file(CodeGen *g) {...@@ -3710,7 +3717,7 @@ static void generate_h_file(CodeGen *g) {
37103717
3711static const char *get_libc_file(CodeGen *g, const char *file) {3718static const char *get_libc_file(CodeGen *g, const char *file) {
3712 Buf *out_buf = buf_alloc();3719 Buf *out_buf = buf_alloc();
3713 os_path_join(g->libc_lib_path, buf_create_from_str(file), out_buf);3720 os_path_join(g->libc_lib_dir, buf_create_from_str(file), out_buf);
3714 return buf_ptr(out_buf);3721 return buf_ptr(out_buf);
3715}3722}
37163723
src/codegen.hpp+2-1
...@@ -23,7 +23,8 @@ void codegen_set_verbose(CodeGen *codegen, bool verbose);...@@ -23,7 +23,8 @@ void codegen_set_verbose(CodeGen *codegen, bool verbose);
23void codegen_set_errmsg_color(CodeGen *codegen, ErrColor err_color);23void codegen_set_errmsg_color(CodeGen *codegen, ErrColor err_color);
24void codegen_set_out_type(CodeGen *codegen, OutType out_type);24void codegen_set_out_type(CodeGen *codegen, OutType out_type);
25void codegen_set_out_name(CodeGen *codegen, Buf *out_name);25void codegen_set_out_name(CodeGen *codegen, Buf *out_name);
26void codegen_set_libc_path(CodeGen *codegen, Buf *libc_path);26void codegen_set_libc_lib_dir(CodeGen *codegen, Buf *libc_lib_dir);
27void codegen_set_libc_include_dir(CodeGen *codegen, Buf *libc_include_dir);
27void codegen_add_lib_dir(CodeGen *codegen, const char *dir);28void codegen_add_lib_dir(CodeGen *codegen, const char *dir);
2829
29void codegen_add_root_code(CodeGen *g, Buf *source_dir, Buf *source_basename, Buf *source_code);30void codegen_add_root_code(CodeGen *g, Buf *source_dir, Buf *source_basename, Buf *source_code);
src/config.h.in+2-1
...@@ -8,7 +8,8 @@...@@ -8,7 +8,8 @@
88
9#define ZIG_HEADERS_DIR "@CMAKE_INSTALL_PREFIX@/@C_HEADERS_DEST@"9#define ZIG_HEADERS_DIR "@CMAKE_INSTALL_PREFIX@/@C_HEADERS_DEST@"
10#define ZIG_STD_DIR "@CMAKE_INSTALL_PREFIX@/@ZIG_STD_DEST@"10#define ZIG_STD_DIR "@CMAKE_INSTALL_PREFIX@/@ZIG_STD_DEST@"
11#define ZIG_LIBC_DIR "@ZIG_LIBC_DIR@"11#define ZIG_LIBC_INCLUDE_DIR "@ZIG_LIBC_INCLUDE_DIR@"
12#define ZIG_LIBC_LIB_DIR "@ZIG_LIBC_LIB_DIR@"
1213
13#cmakedefine ZIG_LLVM_OLD_CXX_ABI14#cmakedefine ZIG_LLVM_OLD_CXX_ABI
1415
src/main.cpp+26-20
...@@ -16,22 +16,23 @@...@@ -16,22 +16,23 @@
16static int usage(const char *arg0) {16static int usage(const char *arg0) {
17 fprintf(stderr, "Usage: %s [command] [options]\n"17 fprintf(stderr, "Usage: %s [command] [options]\n"
18 "Commands:\n"18 "Commands:\n"
19 " build create executable, object, or library from target\n"19 " build create executable, object, or library from target\n"
20 " version print version number and exit\n"20 " version print version number and exit\n"
21 " parseh convert a c header file to zig extern declarations\n"21 " parseh convert a c header file to zig extern declarations\n"
22 "Options:\n"22 "Options:\n"
23 " --release build with optimizations on and debug protection off\n"23 " --release build with optimizations on and debug protection off\n"
24 " --static output will be statically linked\n"24 " --static output will be statically linked\n"
25 " --strip exclude debug symbols\n"25 " --strip exclude debug symbols\n"
26 " --export [exe|lib|obj] override output type\n"26 " --export [exe|lib|obj] override output type\n"
27 " --name [name] override output name\n"27 " --name [name] override output name\n"
28 " --output [file] override destination path\n"28 " --output [file] override destination path\n"
29 " --verbose turn on compiler debug output\n"29 " --verbose turn on compiler debug output\n"
30 " --color [auto|off|on] enable or disable colored error messages\n"30 " --color [auto|off|on] enable or disable colored error messages\n"
31 " --libc-path [path] set the C compiler data path\n"31 " --libc-lib-dir [path] set the C compiler data path\n"
32 " -isystem [dir] add additional search path for other .h files\n"32 " --libc-include-dir [path] set the C compiler data path\n"
33 " -dirafter [dir] same as -isystem but do it last\n"33 " -isystem [dir] add additional search path for other .h files\n"
34 " --library-path [dir] add a directory to the library search path\n"34 " -dirafter [dir] same as -isystem but do it last\n"
35 " --library-path [dir] add a directory to the library search path\n"
35 , arg0);36 , arg0);
36 return EXIT_FAILURE;37 return EXIT_FAILURE;
37}38}
...@@ -55,7 +56,8 @@ int main(int argc, char **argv) {...@@ -55,7 +56,8 @@ int main(int argc, char **argv) {
55 const char *out_name = nullptr;56 const char *out_name = nullptr;
56 bool verbose = false;57 bool verbose = false;
57 ErrColor color = ErrColorAuto;58 ErrColor color = ErrColorAuto;
58 const char *libc_path = nullptr;59 const char *libc_lib_dir = nullptr;
60 const char *libc_include_dir = nullptr;
59 ZigList<const char *> clang_argv = {0};61 ZigList<const char *> clang_argv = {0};
60 ZigList<const char *> lib_dirs = {0};62 ZigList<const char *> lib_dirs = {0};
61 int err;63 int err;
...@@ -102,8 +104,10 @@ int main(int argc, char **argv) {...@@ -102,8 +104,10 @@ int main(int argc, char **argv) {
102 }104 }
103 } else if (strcmp(arg, "--name") == 0) {105 } else if (strcmp(arg, "--name") == 0) {
104 out_name = argv[i];106 out_name = argv[i];
105 } else if (strcmp(arg, "--libc-path") == 0) {107 } else if (strcmp(arg, "--libc-lib-dir") == 0) {
106 libc_path = argv[i];108 libc_lib_dir = argv[i];
109 } else if (strcmp(arg, "--libc-include-dir") == 0) {
110 libc_include_dir = argv[i];
107 } else if (strcmp(arg, "-isystem") == 0) {111 } else if (strcmp(arg, "-isystem") == 0) {
108 clang_argv.append("-isystem");112 clang_argv.append("-isystem");
109 clang_argv.append(argv[i]);113 clang_argv.append(argv[i]);
...@@ -182,8 +186,10 @@ int main(int argc, char **argv) {...@@ -182,8 +186,10 @@ int main(int argc, char **argv) {
182 codegen_set_out_type(g, out_type);186 codegen_set_out_type(g, out_type);
183 if (out_name)187 if (out_name)
184 codegen_set_out_name(g, buf_create_from_str(out_name));188 codegen_set_out_name(g, buf_create_from_str(out_name));
185 if (libc_path)189 if (libc_lib_dir)
186 codegen_set_libc_path(g, buf_create_from_str(libc_path));190 codegen_set_libc_lib_dir(g, buf_create_from_str(libc_lib_dir));
191 if (libc_include_dir)
192 codegen_set_libc_include_dir(g, buf_create_from_str(libc_include_dir));
187 codegen_set_verbose(g, verbose);193 codegen_set_verbose(g, verbose);
188 codegen_set_errmsg_color(g, color);194 codegen_set_errmsg_color(g, color);
189195
src/parseh.cpp+1-1
...@@ -1413,7 +1413,7 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch...@@ -1413,7 +1413,7 @@ int parse_h_file(ImportTableEntry *import, ZigList<ErrorMsg *> *errors, const ch
1413 clang_argv.append(ZIG_HEADERS_DIR);1413 clang_argv.append(ZIG_HEADERS_DIR);
14141414
1415 clang_argv.append("-isystem");1415 clang_argv.append("-isystem");
1416 clang_argv.append(buf_ptr(codegen->libc_include_path));1416 clang_argv.append(buf_ptr(codegen->libc_include_dir));
14171417
1418 for (int i = 0; i < codegen->clang_argv_len; i += 1) {1418 for (int i = 0; i < codegen->clang_argv_len; i += 1) {
1419 clang_argv.append(codegen->clang_argv[i]);1419 clang_argv.append(codegen->clang_argv[i]);