bug fix: fix compiler / linker options order.

tmurakam · Aug 24, 2010 · 87e3746 · 87e3746
1 parent a572bec
commit 87e3746
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+2010-8-24 ver 1.0.5 : Takuya Murakami <tmurakam at tmurakam.org>
+	* modify compiler/linker path argument order
+
 2010-8-19 ver 1.0.4 : Takuya Murakami <tmurakam at tmurakam.org>
 	* add "-rpath /system/lib" option for linker.
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.0.4
+VERSION = 1.0.5
 
 DESTDIR = /usr/local
 

diff --git a/droid-gcc b/droid-gcc
@@ -3,7 +3,7 @@
 =begin
 
   droid-wrapper : Android toolchain wrapper script
-  version 1.0.4
+  version 1.0.5
 
   Copyright 2009-2010, Takuya Murakami, Yoshiaki Okuyama.
 
@@ -101,6 +101,7 @@ link_args =
      "-Wl,-z,nocopyreloc",
      "-Wl,--no-undefined",
      "-Wl,-rpath-link=#{alib}",
+     "-Wl,-rpath,/system/lib",
      "-L#{alib}",
      "-nostdlib",
      "#{alib}/crtbegin_dynamic.o",
@@ -164,20 +165,20 @@ argv = ARGV
 
 case mode
 when "compile"
-    argv = cflags + ARGV
+    argv += cflags
 
 when "link"
     if (!isLD) 
-        argv = cflags + link_args + ARGV
+        argv += cflags + link_args
     else
-        argv = link_args + ARGV
+        argv += link_args
     end
 
 when "shlib"
     if (!isLD)
-        argv = cflags + shlib_args + ARGV
+        argv += cflags + shlib_args
     else
-        argv = shlib_args + ARGV
+        argv += shlib_args
     end
 end