Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upGet dependency directory from cargo metadata #151
Conversation
| @@ -20,8 +20,7 @@ ifneq (,$(CARGO_FEATURE_DEBUGMOZJS)) | |||
| CFLAGS += -g -O0 -DDEBUG -D_DEBUG | |||
| endif | |||
|
|
|||
| MOZJS_OUTDIR = $(shell find $(OUT_DIR)/../.. -name 'mozjs_sys-*' -type d)/out | |||
| CFLAGS += -I$(MOZJS_OUTDIR)/dist/include | |||
| CFLAGS += -I$(DEP_MOZJS_OUTDIR)/dist/include | |||
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
asbaker
May 28, 2015
Author
Contributor
@SimonSapin I checked it out and it looks like the /out component is part of DEP_MOZJS_OUTDIR from mozjs: cargo:outdir=/Users/abaker/Source/rust-mozjs/target/debug/build/mozjs_sys-476fe81cd282b5dc/out
Here is the result of @echo'ing the old variable and the new variable from rust-mozjs's makefile.cargo:
MOZJS_OUTDIR /Users/abaker/Source/rust-mozjs/target/debug/build/js-892e1c7dbc7e3cb5/out/../../mozjs_sys-476fe81cd282b5dc/out
DEP_MOZJS_OUTDIR /Users/abaker/Source/rust-mozjs/target/debug/build/mozjs_sys-476fe81cd282b5dc/out
Looks like CI is just being cranky because the build ran before mozjs was merged to master. It didn't pick up a value for $(DEP_MOZJS_OUTDIR) at all: -I/dist/include
This comment has been minimized.
This comment has been minimized.
SimonSapin
May 28, 2015
Member
Sorry, you’re right. /out is indeed included in the environment variable. I restarted the Travis build and it’s green now.
Get dependency directory from cargo metadata
Fix line cap and line join.
asbaker commentedMay 28, 2015
Part of servo/servo#6088. Depends on servo/mozjs#38 @SimonSapin