OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mk: Replace 'compile_and_link' with 'oxidize'

Browse Source
This commit is contained in:
Brian Anderson 2014-02-09 02:42:28 -08:00
parent f0e0d9e101
commit 3062d0f6bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mk/target.mk
View File

@ -74,7 +74,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
$$(TSREQ$(1)_T_$(2)_H_$(3)) \ $$(TSREQ$(1)_T_$(2)_H_$(3)) \
| $$(TLIB$(1)_T_$(2)_H_$(3))/ | $$(TLIB$(1)_T_$(2)_H_$(3))/
@$$(call E, compile_and_link: $$(@D)/lib$(4)) @$$(call E, oxidize: $$(@D)/lib$(4))
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\ $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4))) $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\ $$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
@ -113,7 +113,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
$$(TSREQ$(1)_T_$(2)_H_$(3)) \ $$(TSREQ$(1)_T_$(2)_H_$(3)) \
| $$(TBIN$(1)_T_$(4)_H_$(3))/ | $$(TBIN$(1)_T_$(4)_H_$(3))/
@$$(call E, compile_and_link: $$@) @$$(call E, oxidize: $$@)
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4)
endef endef

6
mk/tests.mk
View File

@ -347,7 +347,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
$$(CRATEFILE_$(4)) \ $$(CRATEFILE_$(4)) \
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
$$(STDTESTDEP_$(1)_$(2)_$(3)_$(4)) $$(STDTESTDEP_$(1)_$(2)_$(3)_$(4))
@$$(call E, compile_and_link: $$@) @$$(call E, oxidize: $$@)
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
-L "$$(RT_OUTPUT_DIR_$(2))" \ -L "$$(RT_OUTPUT_DIR_$(2))" \
-L "$$(LLVM_LIBDIR_$(2))" -L "$$(LLVM_LIBDIR_$(2))"
@ -835,7 +835,7 @@ define DEF_CHECK_FAST_FOR_T_H
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \ $$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB): \
tmp/$$(FT).rc \ tmp/$$(FT).rc \
$$(SREQ2_T_$(2)_H_$(3)) $$(SREQ2_T_$(2)_H_$(3))
@$$(call E, compile_and_link: $$@) @$$(call E, oxidize: $$@)
$$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \ $$(STAGE2_T_$(2)_H_$(3)) --crate-type=dylib --out-dir $$(@D) $$< \
-L "$$(RT_OUTPUT_DIR_$(2))" -L "$$(RT_OUTPUT_DIR_$(2))"
@ -843,7 +843,7 @@ $(3)/test/$$(FT_DRIVER)-$(2)$$(X_$(2)): \
tmp/$$(FT_DRIVER).rs \ tmp/$$(FT_DRIVER).rs \
$$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \ $$(TLIB2_T_$(2)_H_$(3))/$$(FT_LIB) \
$$(SREQ2_T_$(2)_H_$(3)) $$(SREQ2_T_$(2)_H_$(3))
@$$(call E, compile_and_link: $$@ $$<) @$$(call E, oxidize: $$@ $$<)
$$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \ $$(STAGE2_T_$(2)_H_$(3)) -o $$@ $$< \
-L "$$(RT_OUTPUT_DIR_$(2))" -L "$$(RT_OUTPUT_DIR_$(2))"