diff -u -r ../old/kBuild/tools/GCC3OMF.kmk ./kBuild/tools/GCC3OMF.kmk
old
|
new
|
|
291 | 291 | # |
292 | 292 | # @param $(outbase) Output basename (full). Use this for list files and such. |
293 | 293 | TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp |
| 294 | TOOL_GCC3OMF_LINK_DLL_OUTPUT_MAYBE = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(PATH_STAGE_LIB)/$(notdir $(outbase)).lib) |
294 | 295 | TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) |
295 | | TOOL_GCC3OMF_LINK_DLL_DEPORD = |
| 296 | TOOL_GCC3OMF_LINK_DLL_DEPORD = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(call DIRDEP,$(PATH_STAGE_LIB))) |
296 | 297 | define TOOL_GCC3OMF_LINK_DLL_CMDS |
297 | 298 | $(QUIET)$(APPEND) -n $(outbase).rsp\ |
298 | 299 | $(TOOL_GCC3OMF_LDFLAGS.dll)\ |
299 | | $(flags)\ |
| 300 | $(filter-out KMK_%,$(flags))\ |
300 | 301 | -o $(out)\ |
301 | 302 | $(objs)\ |
302 | 303 | $(foreach p,$(libpath), -L$(p))\ |
… |
… |
|
304 | 305 | $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ |
305 | 306 | -Zmap=$(outbase).map |
306 | 307 | $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp |
| 308 | $(if $(filter KMK_NOIMPLIB,$(flags)),, \ |
| 309 | $(QUIET)$(TOOL_GCC3OMF_AR_IMP) -o $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(out)) |
307 | 310 | $(if $(filter %.res,$(objs)), \ |
308 | 311 | $(QUIET)$(TOOL_GCC3OMF_RC) $(filter %.res,$(objs)) $(out)) |
309 | 312 | endef |
diff -u -r ../old/kBuild/tools/GXX3OMF.kmk ./kBuild/tools/GXX3OMF.kmk
old
|
new
|
|
291 | 291 | # |
292 | 292 | # @param $(outbase) Output basename (full). Use this for list files and such. |
293 | 293 | TOOL_GXX3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp |
| 294 | TOOL_GXX3OMF_LINK_DLL_OUTPUT_MAYBE = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(PATH_STAGE_LIB)/$(notdir $(outbase)).lib) |
294 | 295 | TOOL_GXX3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc) |
295 | | TOOL_GXX3OMF_LINK_DLL_DEPORD = |
| 296 | TOOL_GXX3OMF_LINK_DLL_DEPORD = $(if $(filter KMK_NOIMPLIB,$(flags)),,$(call DIRDEP,$(PATH_STAGE_LIB))) |
296 | 297 | define TOOL_GXX3OMF_LINK_DLL_CMDS |
297 | 298 | $(QUIET)$(APPEND) -n $(outbase).rsp\ |
298 | 299 | $(TOOL_GXX3OMF_LDFLAGS.dll)\ |
299 | | $(flags)\ |
| 300 | $(filter-out KMK_%,$(flags))\ |
300 | 301 | -o $(out)\ |
301 | 302 | $(objs)\ |
302 | 303 | $(foreach p,$(libpath), -L$(p))\ |
… |
… |
|
304 | 305 | $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\ |
305 | 306 | -Zmap=$(outbase).map |
306 | 307 | $(QUIET)$(TOOL_GXX3OMF_LD) @$(outbase).rsp |
| 308 | $(if $(filter KMK_NOIMPLIB,$(flags)),, \ |
| 309 | $(QUIET)$(TOOL_GXX3OMF_AR_IMP) -o $(PATH_STAGE_LIB)/$(notdir $(outbase)).lib $(out)) |
307 | 310 | $(if $(filter %.res,$(objs)), \ |
308 | 311 | $(QUIET)$(TOOL_GXX3OMF_RC) $(filter %.res,$(objs)) $(out)) |
309 | 312 | endef |