Merge branch 'release/0.18'

crystal-lang · Jun 21, 2016 · 8a602d7 · 8a602d7
2 parents aa1d7f2 + 254c18c
commit 8a602d7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/compiler/crystal/codegen/link.cr b/src/compiler/crystal/codegen/link.cr
@@ -18,12 +18,6 @@ module Crystal
       has_pkg_config = nil
 
       String.build do |flags|
-        # Add the default path as -L flags: important on FreeBSD,
-        # where the default cc doesn't use /usr/local/lib by default
-        library_path.each do |path|
-          flags << " -L#{path}"
-        end
-
         link_attributes.reverse_each do |attr|
           if ldflags = attr.ldflags
             flags << " " << ldflags
@@ -47,6 +41,12 @@ module Crystal
             flags << " -framework " << framework
           end
         end
+
+        # Append the default paths as -L flags in case the linker doesn't know
+        # about them (eg: FreeBSD won't search /usr/local/lib by default):
+        library_path.each do |path|
+          flags << " -L#{path}"
+        end
       end
     end