Commit 5dde3cd3bdaf5cca0c8aca94483b7227ecc551be | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-09-08 15:09:05-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-09-08 15:09:05-04:00
log	5dde3cd3bdaf5cca0c8aca94483b7227ecc551be
tree	5d26f4a4b44b93d0b67cab0f9bc719015f0ff323
parent	ec13fa3f4ae49dec7045a61dc380ab3bd9f0a635
signature	Commit is signed but in an unrecognized format.

2 files changed, 6 insertions(+), 3 deletions(-)

src/codegen.cpp+5

 @@ -8774,6 +8774,11 @@ void add_cc_args(CodeGen *g, ZigList<const char *> &args, const char *out_dep_pa
         }
     }
+    for (size_t i = 0; i < g->framework_dirs.length; i += 1) {
+        args.append("-iframework");
+        args.append(g->framework_dirs.at(i));
+    }
     //note(dimenus): appending libc headers before c_headers breaks intrinsics
     //and other compiler specific items
     // According to Rich Felker libc headers are supposed to go before C language headers.

src/main.cpp+1-3

 @@ -784,9 +784,7 @@ int main(int argc, char **argv) {
                 } else if (strcmp(arg, "--library-path") == 0 || strcmp(arg, "-L") == 0) {
                     lib_dirs.append(argv[i]);
                 } else if (strcmp(arg, "-F") == 0) {
-                    framework_dirs.append(argv[i]); // embedded linker
+                    framework_dirs.append(argv[i]);
-                    clang_argv.append("-iframework"); // embedded clang
-                    clang_argv.append(argv[i]);
                 } else if (strcmp(arg, "--library") == 0 || strcmp(arg, "-l") == 0) {
                     if (strcmp(argv[i], "c") == 0)
                         have_libc = true;