diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-03-12 18:09:40 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2019-03-12 18:09:40 -0400 |
| commit | 9741b2aab47ec899276a52827f72509fc322388a (patch) | |
| tree | 2401c596d75282a6a6c1b75d24f2101b221cd0d8 /src | |
| parent | 5570bc986b916ffb07b77853cf995d90c7e99805 (diff) | |
| download | zig-9741b2aab47ec899276a52827f72509fc322388a.tar.gz zig-9741b2aab47ec899276a52827f72509fc322388a.zip | |
avoid a string that is too long for msvc
Diffstat (limited to 'src')
| -rw-r--r-- | src/config.h.in | 2 | ||||
| -rw-r--r-- | src/install_files.h.in | 15 | ||||
| -rw-r--r-- | src/link.cpp | 10 | ||||
| -rw-r--r-- | src/main.cpp | 1 |
4 files changed, 6 insertions, 22 deletions
diff --git a/src/config.h.in b/src/config.h.in index a99aab0d72..93e31ad9b7 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -23,5 +23,7 @@ #define ZIG_LLD_LIBRARIES "@LLD_LIBRARIES@" #define ZIG_LLVM_CONFIG_EXE "@LLVM_CONFIG_EXE@" #define ZIG_DIA_GUIDS_LIB "@ZIG_DIA_GUIDS_LIB_ESCAPED@" +#define ZIG_STD_FILES "@ZIG_STD_FILES@" +#define ZIG_C_HEADER_FILES "@ZIG_C_HEADER_FILES@" #endif diff --git a/src/install_files.h.in b/src/install_files.h.in deleted file mode 100644 index 2c31c6d13c..0000000000 --- a/src/install_files.h.in +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (c) 2019 Andrew Kelley - * - * This file is part of zig, which is MIT licensed. - * See http://opensource.org/licenses/MIT - */ - -#ifndef ZIG_INSTALL_FILES_H -#define ZIG_INSTALL_FILES_H - -#define ZIG_MUSL_SRC_FILES "@ZIG_MUSL_SRC_FILES@" -#define ZIG_STD_FILES "@ZIG_STD_FILES@" -#define ZIG_C_HEADER_FILES "@ZIG_C_HEADER_FILES@" - -#endif diff --git a/src/link.cpp b/src/link.cpp index 854100897f..b3aa94f0ee 100644 --- a/src/link.cpp +++ b/src/link.cpp @@ -501,15 +501,13 @@ static const char *build_musl(CodeGen *parent) { MuslSrcO3, }; + const char *target_musl_arch_name = musl_arch_name(parent->zig_target); + HashMap<Buf *, MuslSrc, buf_hash, buf_eql_buf> source_table = {}; source_table.init(1800); - SplitIterator install_h_it = memSplit(str(ZIG_MUSL_SRC_FILES), str(";")); - const char *target_musl_arch_name = musl_arch_name(parent->zig_target); - for (;;) { - Optional<Slice<uint8_t>> opt_item = SplitIterator_next(&install_h_it); - if (!opt_item.is_some) break; - Buf *src_file = buf_create_from_slice(opt_item.value); + for (size_t i = 0; i < array_length(ZIG_MUSL_SRC_FILES); i += 1) { + Buf *src_file = buf_create_from_str(ZIG_MUSL_SRC_FILES[i]); MuslSrc src_kind; if (buf_ends_with_str(src_file, ".c")) { diff --git a/src/main.cpp b/src/main.cpp index af3b878b09..28da1cbbe7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -10,7 +10,6 @@ #include "codegen.hpp" #include "compiler.hpp" #include "config.h" -#include "install_files.h" #include "error.hpp" #include "os.hpp" #include "target.hpp" |