Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GECKO_PATH and GECKO_OBJ_DIR should read the correct value #288

Merged
merged 1 commit into from Apr 27, 2012
Merged

GECKO_PATH and GECKO_OBJ_DIR should read the correct value #288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Expand Up @@ -185,7 +185,7 @@ ifeq (glue/gonk,$(GONK_BASE))
GECKO_OBJDIR = $(GECKO_PATH)/objdir-prof-gonk
MOZCONFIG = $(abspath config/gecko-prof-gonk)
else
GECKO_OBJDIR = objdir-gecko
GECKO_OBJDIR = $(abspath objdir-gecko)
MOZCONFIG = $(abspath glue/gonk-ics/gonk-misc/default-gecko-config)
endif

Expand All @@ -199,7 +199,7 @@ define GECKO_BUILD_CMD
export TARGET_TOOLS_PREFIX="$(abspath $(TOOLCHAIN_PATH))" && \
export MOZCONFIG="$(MOZCONFIG)" && \
export EXTRA_INCLUDE='$(EXTRA_INCLUDE)' && \
export GECKO_OBJDIR="$(abspath objdir-gecko)" && \
export GECKO_OBJDIR="$(GECKO_OBJDIR)" && \
ulimit -n 4096 && \
$(MAKE) -C $(GECKO_PATH) -f client.mk -s $(MAKE_FLAGS) && \
$(MAKE) -C $(GECKO_OBJDIR) package
Expand All @@ -218,8 +218,8 @@ gonk:
@$(call DEP_CHECK,$(GONK_PATH)/out/.b2g-build-done,$(GONK_BASE), \
$(call GONK_CMD,$(MAKE) $(MAKE_FLAGS) $(GONK_MAKE_FLAGS) \
CONFIG_ESD=no \
GECKO_PATH="$(abspath gecko)" \
GECKO_OBJDIR="$(abspath objdir-gecko)" ) ; \
GECKO_PATH=$(GECKO_PATH) \
GECKO_OBJDIR=$(GECKO_OBJDIR) ) ;\
$(if $(filter qemu,$(KERNEL)), \
cp $(GONK_PATH)/system/core/rootdir/init.rc.gonk \
$(GONK_PATH)/out/target/product/$(GONK)/root/init.rc))
Expand Down