From 9a7679811215a5cae2b4091f2fcda0a2faf4217d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Tue, 4 Mar 2008 12:40:18 +0100 Subject: [PATCH] scons: Force C++ linkage. We have some C++ code (LLVM), which must be linked with g++ on certain platforms. SCons tries to guess when to use g++ by looking to the source files, but this fails, if the C++ code is not list in the command line, but inside in the library. --- SConstruct | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index 6f95d12..dd118df 100644 --- a/SConstruct +++ b/SConstruct @@ -206,7 +206,10 @@ if llvm: env.ParseConfig('llvm-config --cflags --ldflags --libs') env.Append(CPPDEFINES = ['MESA_LLVM']) env.Append(CXXFLAGS = ['-Wno-long-long']) - + +# Force C++ linkage +if env['PLATFORM'] in ('posix',): + env['LINK'] = env['CXX'] # libGL if platform not in ('winddk',): -- 2.7.4