Changeset 550

Timestamp:

02/14/09 00:04:33 (3 years ago)

Author:

mooneer

Message:

Forgot to add library_ldflags and file_cflags to command lines.

File:

• interpreter/trunk/modules/System/package/builder.kt (modified) (3 diffs)

interpreter/trunk/modules/System/package/builder.kt

@@ -76 +76 @@
 )
 [
+    property cflags;
+    decide [
+        (options.file_cflags[lib_file] is System.null) [ cflags = ""; ],
+        true [ cflags = options.file_cflags[lib_file]; ]
+    ];
+    
     decide [
         (not ((make System.regex("\\.kt$"))|match(lib_file) is System.null))
@@ -87 +93 @@
         [
             # C++ file.
-            run_command_with_echo("%s %s -c %s"|format([
+            run_command_with_echo("%s %s %s -c %s"|format([
                 System.compile_options.build_cplusplus,
                 System.compile_options.build_cxxflags,
+                cflags,
                 lib_file]));
         ],
         true [
             # C file.
-            run_command_with_echo("%s %s -c %s"|format([
+            run_command_with_echo("%s %s %s -c %s"|format([
                 System.compile_options.build_cc,
                 System.compile_options.build_cxxflags,
+                cflags,
                 lib_file]));
         ]
@@ -161 +169 @@
     
     # Link library.
+    property ldflags;
+    decide [
+        (options.library_ldflags[lib] is System.null) [ ldflags = ""; ],
+        true [ ldflags = options.library_ldflags[lib]; ]
+    ];
     decide [
         (compile_outputs != "") [
-            run_command_with_echo("%s %s %s -o dist/%s %s"|format([
+            run_command_with_echo("%s %s %s %s -o dist/%s %s"|format([
                 System.compile_options.build_cc,
                 System.compile_options.build_ldflags,
                 System.compile_options.build_dylib_flags,
+                ldflags,
                 ((make System.regex("\\."))|replace(lib, "/") + System.compile_options.build_dylib_extension),
                 compile_outputs