提交 b2714cbc authored 作者: Travis Cross's avatar Travis Cross

Fix mod_mongo build when no CFLAGS/CXXFLAGS are set in environment

os.environ['CFLAGS'] raises a KeyError if no CFLAGS variable is set in
the environment.  So instead we use os.environ.get('CFLAGS','') which
will return the empty string in the event no CFLAGS variable is set.

The previous problematic pattern originated from the suggested code
here for importing the build environment in SCons:

  http://www.scons.org/wiki/FrequentlyAskedQuestions#Why_doesn.27t_SCons_find_my_compiler.2BAC8-linker.2BAC8-etc..3F_I_can_execute_it_just_fine_from_the_command_line.

FS-4746 --resolve
上级 99a80520
...@@ -25,8 +25,8 @@ $(MONGO_CXX_DRIVER_SRC): ...@@ -25,8 +25,8 @@ $(MONGO_CXX_DRIVER_SRC):
$(LIBMONGOCLIENT_A): $(MONGO_CXX_DRIVER_SRC) $(LIBMONGOCLIENT_A): $(MONGO_CXX_DRIVER_SRC)
(cd $(MONGO_CXX_DRIVER_SRC) && \ (cd $(MONGO_CXX_DRIVER_SRC) && \
sed -i SConstruct -e "s/Environment()/Environment(ENV = {'PATH' : os.environ['PATH'],'CFLAGS' : os.environ['CFLAGS'],'CXXFLAGS' : os.environ['CXXFLAGS']})/" && \ sed -i SConstruct -e "s|Environment()|Environment(ENV = {'PATH' : os.environ.get('PATH','/bin:/usr/bin'),'CFLAGS' : os.environ.get('CFLAGS',''),'CXXFLAGS' : os.environ.get('CXXFLAGS','')})|" && \
echo "env.Append(PATH=os.environ['PATH'])" >> SConstruct && \ echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \
scons) scons)
$(TOUCH_TARGET) $(TOUCH_TARGET)
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论