Closed Bug 1323127 Opened 4 years ago Closed 4 years ago

Pass absolute path of DIST to cargo

Categories

(Firefox Build System :: General, defect)

defect
Not set
normal

Tracking

(firefox53 fixed)

RESOLVED FIXED
mozilla53
Tracking Status
firefox53 --- fixed

People

(Reporter: xidorn, Assigned: xidorn)

References

Details

Attachments

(1 file)

Bug 1318981 passes MOZ_DIST to cargo, but the value is something like ../../../dist, which is useless for the build script. It needs to be an absolute path.
Comment on attachment 8818163 [details]
Bug 1323127 - Pass absolute path of DIST to cargo.

https://reviewboard.mozilla.org/r/98278/#review98880

::: config/rules.mk:945
(Diff revision 1)
> -CARGO_BUILD = env $(rustflags_override) CARGO_TARGET_DIR=. RUSTC=$(RUSTC) MOZ_DIST=$(DIST) $(CARGO) build $(cargo_build_flags)
> +ifeq ($(HOST_OS_ARCH),WINNT)
> +MOZ_DIST = $(shell cd $(DIST) && pwd -W)
> +else
> +MOZ_DIST = $(shell cd $(DIST) && pwd)
> +endif

`ABS_DIST` exists for this purpose; we should use that instead rather than invoking a shell.
Attachment #8818163 - Flags: review-
Comment on attachment 8818163 [details]
Bug 1323127 - Pass absolute path of DIST to cargo.

https://reviewboard.mozilla.org/r/98278/#review98980
Attachment #8818163 - Flags: review?(cmanchester)
Comment on attachment 8818163 [details]
Bug 1323127 - Pass absolute path of DIST to cargo.

https://reviewboard.mozilla.org/r/98278/#review98990

Thanks.  FWIW, I used this patch in a local build-time bindgen patch series and it works great!
Attachment #8818163 - Flags: review?(nfroyd) → review+
Pushed by nfroyd@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/d706e2d4abfd
Pass absolute path of DIST to cargo. r=froydnj
https://hg.mozilla.org/mozilla-central/rev/d706e2d4abfd
Status: NEW → RESOLVED
Closed: 4 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla53
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.