From fb015b4a9838acd55d6d9cbfe3d73691bca7842d Mon Sep 17 00:00:00 2001
From: Joe Rozner <joe@prevoty.com>
Date: Fri, 8 Nov 2013 16:30:08 -0800
Subject: [PATCH] Fix SCons bugs
Don't clober the Environment (and thus the ENV['PATH'] by redefining it
and don't link against lr by default. Only add it if uname is not Darwin
---
SConstruct | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/SConstruct b/SConstruct
index a0361c62..a015b749 100644
--- a/SConstruct
+++ b/SConstruct
@@ -3,13 +3,12 @@ import os
import os.path
import sys
-env = Environment(ENV = {'PATH' : os.environ['PATH']})
vars = Variables(None, ARGUMENTS)
vars.Add(PathVariable('DESTDIR', "Root directory to install in (useful for packaging scripts)", None, PathVariable.PathIsDirCreate))
vars.Add(PathVariable('prefix', "Where to install in the FHS", "/usr/local", PathVariable.PathAccept))
-env = Environment(variables=vars)
+env = Environment(ENV = os.environ, variables = vars)
def calcInstallPath(*elements):
path = os.path.abspath(os.path.join(*map(env.subst, elements)))
@@ -31,7 +30,7 @@ env['libpath'] = calcInstallPath("$prefix", "lib")
env['incpath'] = calcInstallPath("$prefix", "include", "hammer")
# TODO: Add pkgconfig
-env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes -lrt")
+env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes")
if not env['PLATFORM'] == 'darwin':
env.MergeFlags("-lrt")
--
GitLab