From d35fe752eb8c4b4c94aef3315d4992d080b72ea4 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Sat, 23 Jul 2016 17:02:15 +0000 Subject: [PATCH] Fixes OSX. git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3280 ed5197a5-7fde-0310-b194-c3ffbd925b24 --- SConstruct | 6 +++--- tools/update-deps | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 579e65e0..0aacbf8c 100644 --- a/SConstruct +++ b/SConstruct @@ -37,11 +37,11 @@ if sys.platform == 'win32': env.Append(LINKFLAGS=['/RELEASE', '/OPT:REF', '/OPT:ICF']) elif sys.platform == 'darwin': env.Append(LIBS=['v8_base', 'v8_libbase', 'v8_libplatform', 'v8_nosnapshot', 'icui18n', 'icuuc', 'icudata', 'pthread', 'uv']) - env.Append(CXXFLAGS=['--std=c++11', '-g', '-Wall', '-stdlib=libstdc++']) + env.Append(CXXFLAGS=['--std=c++11', '-g', '-Wall', '-stdlib=libc++']) env.Append(CFLAGS=['-g', '-Wall']) - env.Append(LINKFLAGS=['-g', '-stdlib=libstdc++']) + env.Append(LINKFLAGS=['-g', '-stdlib=libc++']) env.Append(LIBPATH=[ - os.path.join(v8, 'xcodebuild/Release'), + os.path.join(v8, 'out/native'), os.path.join(uv, 'build/Release'), ]) else: diff --git a/tools/update-deps b/tools/update-deps index fbaa289c..f6aedbec 100755 --- a/tools/update-deps +++ b/tools/update-deps @@ -125,8 +125,7 @@ def updateV8(): if sys.platform == 'linux2': run(['make', '-j' + str(cores), 'native'], cwd=kV8Work) elif sys.platform == 'darwin': - run(['build/gyp_v8', '-Dtarget_arch=x64'], cwd=kV8Work) - run(['xcodebuild', '-project', 'build/all.xcodeproj', '-configuration', 'Release'], cwd=kV8Work) + run(['make', '-j' + str(cores), 'native'], cwd=kV8Work) elif sys.platform == 'win32': run(['python', 'build\\gyp_v8', '-Dtarget_arch=x64'], cwd=kV8Work, env=win32Env) run(['devenv.com', '/Build', 'Release', 'build\\All.sln'], cwd=kV8Work)