Skip to content

Commit

Permalink
Disable arc
Browse files Browse the repository at this point in the history
  • Loading branch information
elia committed Sep 23, 2012
1 parent 0201679 commit cad4edd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Frameworks/OakFoundation/target
Expand Up @@ -3,5 +3,5 @@ LINK += text io regexp
EXPORT = src/*.h
FRAMEWORKS = Cocoa

OBJCXX_FLAGS += -fobjc-arc
LN_FLAGS += -fobjc-arc-cxxlib=libc++
# OBJCXX_FLAGS += -fobjc-arc
# LN_FLAGS += -fobjc-arc-cxxlib=libc++
8 changes: 4 additions & 4 deletions bin/gen_build
Expand Up @@ -173,8 +173,8 @@ def pch_for(src, target)
target['PRELUDE'].each do |pch|
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/
# res << "-arc" if srcExt == 'm' && target['OBJ_FLAGS'] =~ /-fobjc-arc/
# res << "-arc" if srcExt == 'mm' && target['OBJCXX_FLAGS'] =~ /-fobjc-arc/
return res
end
end
Expand Down Expand Up @@ -638,7 +638,7 @@ end

open("#{builddir}/build.ninja", "w") do |io|
user_variables = TARGETS.root.to_a.reject { |arr| arr[0].class != String || GLOB_KEYS.include?(arr[0]) }.sort { |lhs, rhs| lhs[0] <=> rhs[0] }
tmp = variables.dup.concat(user_variables)
tmp = variables.dup.concat(user_variables)
width = tmp.map { |arr| arr[0].length }.max { |lhs, rhs| lhs <=> rhs }

io << variables.map { |arr| format("%-#{width}s = %s\n", *arr) }
Expand Down Expand Up @@ -677,7 +677,7 @@ open("#{builddir}/build.ninja", "w") do |io|
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"
io << " RAVE_FLAGS = #{type[ext]} \n\n" #-fobjc-arc
end
end

Expand Down
3 changes: 3 additions & 0 deletions target
Expand Up @@ -8,6 +8,9 @@ FLAGS += -Wall -Wwrite-strings -Wformat -Winit-self -Wmissing-include-dirs -Wno-
FLAGS += -Wno-address-of-temporary
FLAGS += -IShared/include
FLAGS += -fcolor-diagnostics
FLAGS += -fobjc-gc
OBJCXX_FLAGS += -fobjc-gc
LN_FLAGS += -fobjc-gc-cxxlib=libc++

# FLAGS += -D_GLIBCXX_DEBUG
FLAGS += -DNDEBUG -Os
Expand Down

0 comments on commit cad4edd

Please sign in to comment.