scons: make sure that we set the PKG_CONFIG_PATH before build

This commit is contained in:
Dane Springmeyer 2011-02-08 03:27:08 +00:00
parent 6f6b161c7c
commit bdc184c686

View file

@ -1324,12 +1324,15 @@ if not HELP_REQUESTED and '-c' not in command_line_args:
# dummy action in case there is nothing to uninstall, to avoid phony error.. # dummy action in case there is nothing to uninstall, to avoid phony error..
env.Alias("uninstall", "") env.Alias("uninstall", "")
env['create_uninstall_target'] = create_uninstall_target env['create_uninstall_target'] = create_uninstall_target
if env['PKG_CONFIG_PATH']:
env['ENV']['PKG_CONFIG_PATH'] = env['PKG_CONFIG_PATH']
# otherwise this variable == os.environ["PKG_CONFIG_PATH"]
# export env so it is available in Sconscript files # export env so it is available in Sconscript files
Export('env') Export('env')
# clear the '_CPPDEFFLAGS' variable # clear the '_CPPDEFFLAGS' variable
# for unknown reasons this variable puts -DNone # for unknown reasons this variable puts -DNone
# in the g++ args prompting unnecessary recompiles # in the g++ args prompting unnecessary recompiles