Bug 1262155 - Always pass defines when compiling SOBJS. draft
authorChris Manchester <cmanchester@mozilla.com>
Thu, 15 Sep 2016 17:46:48 -0700
changeset 414237 ee10c3ebe282415995fedc4a9a63ca1d5bd5cb5b
parent 413053 f5d043ce6d36a3c461cbd829d4a4a38394b7c436
child 414238 6d7e796c1472772a6b0f9136d696fdcded1c58c9
push id29629
push userbmo:cmanchester@mozilla.com
push dateFri, 16 Sep 2016 00:47:17 +0000
bugs1262155
milestone51.0a1
Bug 1262155 - Always pass defines when compiling SOBJS. This is relevant when attempting to build libffi with our build system (libffi expects its assembly sources to be pre-processed). MozReview-Commit-ID: J6mCUkYYjQh
config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -939,17 +939,17 @@ force-cargo-build:
 	env CARGO_TARGET_DIR=. RUSTC=$(RUSTC) $(CARGO) build $(cargo_build_flags) --
 
 $(RUST_LIBRARY_FILE): force-cargo-build
 endif # CARGO_FILE
 endif # MOZ_RUST
 
 $(SOBJS):
 	$(REPORT_BUILD)
-	$(AS) -o $@ $(ASFLAGS) $($(notdir $<)_FLAGS) $(LOCAL_INCLUDES) -c $<
+	$(AS) -o $@ $(DEFINES) $(ASFLAGS) $($(notdir $<)_FLAGS) $(LOCAL_INCLUDES) -c $<
 
 $(CPPOBJS):
 	$(REPORT_BUILD_VERBOSE)
 	$(call BUILDSTATUS,OBJECT_FILE $@)
 	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $(_VPATH_SRCS)
 
 $(CMMOBJS):
 	$(REPORT_BUILD_VERBOSE)