Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #288 from YiyiLee/Makefile_Error_Variable

GECKO_PATH and GECKO_OBJ_DIR should read the correct value
  • Loading branch information...
commit 82b83980e764a62b3b577a6d911c50c151936cc8 2 parents ab67584 + 2e447df
@andreasgal andreasgal authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 Makefile
View
8 Makefile
@@ -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
@@ -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
@@ -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))
Please sign in to comment.
Something went wrong with that request. Please try again.