From 25d15fe2afbbcd35d512b6089bd5a89f51e196d8 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Mon, 27 Feb 2012 13:09:19 +0100 Subject: [PATCH] Disabling OpenMP for good on OS X --- SConstruct | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index 1e7f890c8..cf00e5174 100644 --- a/SConstruct +++ b/SConstruct @@ -216,8 +216,10 @@ protobld = Builder(action = 'protoc -I=DataStructures/pbf-proto --cpp_out=DataSt env.Append(BUILDERS = {'Protobuf' : protobld}) osm1 = env.Protobuf('DataStructures/pbf-proto/fileformat.proto') osm2 = env.Protobuf('DataStructures/pbf-proto/osmformat.proto') -env.Append(CCFLAGS = ['-fopenmp']) -env.Append(LINKFLAGS = ['-fopenmp']) + +if sys.platform != 'darwin': + env.Append(CCFLAGS = ['-fopenmp']) + env.Append(LINKFLAGS = ['-fopenmp']) env.Program(target = 'osrm-extract', source = ["extractor.cpp", Glob('DataStructures/pbf-proto/*.pb.cc'), Glob('Util/*.cpp')], depends=['osm1', 'osm2']) env.Program(target = 'osrm-prepare', source = ["createHierarchy.cpp", 'Contractor/EdgeBasedGraphFactory.cpp', Glob('Util/SRTMLookup/*.cpp'), Glob('Algorithms/*.cpp')])