Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 673940: Don't accidentally overwrite the environment's PYTHONPATH. r=ted

Browse Source
This commit is contained in:
Kyle Huey 2011-07-25 10:20:43 -07:00
parent c4c33c7ccf
commit e29d01fd7b
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.mk
View File

@ -164,10 +164,10 @@ SLEEP ?= sleep
TOUCH ?= touch
ifndef .PYMAKE
PYTHONPATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
else
PYCOMMANDPATH += $(topsrcdir)/config
PYTHONPATH = %pythonpath main
PYTHON_PATH = %pythonpath main
endif
# determine debug-related options

2
config/rules.mk
View File

@ -1537,7 +1537,7 @@ XPIDL_DEPS = \
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
$(REPORT_BUILD)
$(PYTHONPATH) \
$(PYTHON_PATH) \
-I$(topsrcdir)/other-licenses/ply \
-I$(topsrcdir)/xpcom/idl-parser \
$(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(topsrcdir)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@

4
js/src/config/config.mk
View File

@ -164,10 +164,10 @@ SLEEP ?= sleep
TOUCH ?= touch
ifndef .PYMAKE
PYTHONPATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
PYTHON_PATH = $(PYTHON) $(topsrcdir)/config/pythonpath.py
else
PYCOMMANDPATH += $(topsrcdir)/config
PYTHONPATH = %pythonpath main
PYTHON_PATH = %pythonpath main
endif
# determine debug-related options

2
js/src/config/rules.mk
View File

@ -1537,7 +1537,7 @@ XPIDL_DEPS = \
$(XPIDL_GEN_DIR)/%.h: %.idl $(XPIDL_DEPS) $(XPIDL_GEN_DIR)/.done
$(REPORT_BUILD)
$(PYTHONPATH) \
$(PYTHON_PATH) \
-I$(topsrcdir)/other-licenses/ply \
-I$(topsrcdir)/xpcom/idl-parser \
$(topsrcdir)/xpcom/idl-parser/header.py --cachedir=$(topsrcdir)/xpcom/idl-parser $(XPIDL_FLAGS) $(_VPATH_SRCS) -d $(MDDEPDIR)/$(@F).pp -o $@