github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow enabling ARC per target

Browse Source 
The issue is that the precompiled header must also be created with ARC enabled, so now we use different precompiled headers depending on wether or not the file to be compiled has -fobjc-arc enabled.

The way this is done is hardcoded for the ARC options, it might be nice to abstract it so that the PCH dependency had a name derived from the PCH-sensitive compiler options.
This commit is contained in:
Allan Odgaard
2012-09-22 11:42:49 +02:00
parent 54377e35a9
commit ed7a93af93
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/gen_build
View File

@@ -169,8 +169,14 @@ def compiler_for(source)
end
def pch_for(src, target)
srcExt = src[/\b[a-z]+$/]
target['PRELUDE'].each do |pch|
return "#{build_path(pch)}" if src[/\b[a-z]+$/] == pch[/\b[a-z]+$/]
if srcExt == pch[/\b[a-z]+$/]
res = build_path(pch)
res << "-arc" if srcExt == 'm' && target['OBJ_FLAGS'] =~ /-fobjc-arc/
res << "-arc" if srcExt == 'mm' && target['OBJCXX_FLAGS'] =~ /-fobjc-arc/
return res
end
end
abort "*** no pre-compiled header for #{src} (target: #{target[:name]})"
end
@@ -662,9 +668,17 @@ open("#{builddir}/build.ninja", "w") do |io|
TARGETS.root['PRELUDE'].each do |src|
type = { 'c' => '-x c-header', 'm' => '-x objective-c-header', 'cc' => '-x c++-header', 'mm' => '-x objective-c++-header' }
ext = src[/\b[a-z]+$/]
io << "build #{pch_for(src, TARGETS.root)}.gch: #{compiler_for(src)} #{src}\n"
io << " depfile = #{pch_for(src, TARGETS.root)}.gch.d\n"
io << " RAVE_FLAGS = #{type[src[/\b[a-z]+$/]]}\n\n"
io << " RAVE_FLAGS = #{type[ext]}\n\n"
if ext =~ /^mm?$/
io << "build #{pch_for(src, TARGETS.root)}-arc.gch: #{compiler_for(src)} #{src}\n"
io << " depfile = #{pch_for(src, TARGETS.root)}-arc.gch.d\n"
io << " RAVE_FLAGS = #{type[ext]} -fobjc-arc\n\n"
end
end
# =======================================================