From fdb4198c0db4571ecc50d57b64d72322d2fc6766 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Mon, 27 Feb 2012 11:51:59 +0100 Subject: [PATCH] Further adjustments for OS X --- SConstruct | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 81e4c9f5f..1e7f890c8 100644 --- a/SConstruct +++ b/SConstruct @@ -2,6 +2,7 @@ import os import os.path +import string import sys from subprocess import call @@ -61,7 +62,7 @@ conf = Configure(env, custom_tests = { 'CheckBoost' : CheckBoost, 'CheckProtobuf if GetOption('cxx') is None: #default Compiler - print 'Using default C++ Compiler: ', env['CXX'] + print 'Using default C++ Compiler: ', env['CXX'].strip() else: env.Replace(CXX = GetOption('cxx')) print 'Using user supplied C++ Compiler: ', env['CXX'] @@ -74,7 +75,8 @@ else: if sys.platform == 'darwin': #Mac OS X #os x default installations env.Append(CPPPATH = ['/usr/include/libxml2'] ) - env.Append(CPPPATH = ["/usr/X11/include"]) #comes with os x + env.Append(CPPPATH = ['/usr/X11/include']) #comes with os x + env.Append(LIBPATH = ['/usr/X11/lib']) #needed for libpng #assume stxxl and boost are installed via homebrew. call brew binary to get folder locations import subprocess @@ -104,7 +106,7 @@ else: Exit(-1) #Check if architecture optimizations shall be turned off -if GetOption('buildconfiguration') != 'debug' and GetOption('nomarch') == None: +if GetOption('buildconfiguration') != 'debug' and GetOption('nomarch') == None and sys.platform != 'darwin': env.Append(CCFLAGS = ['-march=native']) if not conf.CheckHeader('omp.h'):