Update Rakefile to support locally-installed libcheck, removed efence, pushed

-l arguments to end of link command line.
This commit is contained in:
Matthew Bloch
2012-10-07 02:09:34 +01:00
parent 1fa8ba82a5
commit 7b13964c39

View File

@@ -24,13 +24,16 @@ CCFLAGS = %w(
-Wno-missing-field-initializers -Wno-missing-field-initializers
) + # Added -Wno-missing-field-initializers to shut GCC up over {0} struct initialisers ) + # Added -Wno-missing-field-initializers to shut GCC up over {0} struct initialisers
[ENV['CFLAGS']] [ENV['CFLAGS']]
LIBCHECK = "/usr/lib/libcheck.a"
LIBCHECK = File.exists?("/usr/lib/libcheck.a") ?
"/usr/lib/libcheck.a" :
"/usr/local/lib/libcheck.a"
TEST_MODULES = Dir["tests/unit/check_*.c"].map { |n| TEST_MODULES = Dir["tests/unit/check_*.c"].map { |n|
File.basename( n )[%r{check_(.+)\.c},1] } File.basename( n )[%r{check_(.+)\.c},1] }
if DEBUG if DEBUG
LDFLAGS << ["-g", "-lefence"] LDFLAGS << ["-g"]
CCFLAGS << ["-g -DDEBUG"] CCFLAGS << ["-g -DDEBUG"]
end end
@@ -96,10 +99,10 @@ def gcc_link(target, objects)
FileUtils.mkdir_p File.dirname( target ) FileUtils.mkdir_p File.dirname( target )
sh "#{CC} #{LDFLAGS.join(' ')} "+ sh "#{CC} #{LDFLAGS.join(' ')} "+
LIBS.map { |l| "-l#{l}" }.join(" ")+
" -Isrc " + " -Isrc " +
" -o #{target} "+ " -o #{target} "+
objects.join(" ") objects.join(" ") +
" "+LIBS.map { |l| "-l#{l}" }.join(" ")
end end
def headers(c) def headers(c)