VirtualBox

Changeset 10188

Show
Ignore:
Timestamp:
07/04/08 04:22:39 (2 months ago)
Author:
vboxsync
Message:

Converted to sub-makefile.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/recompiler/Makefile.kmk

    r10186 r10188  
    372372 
    373373# The command sans -o op.S.tmp. 
    374 COMPILE_OP_CMDS = $(VBOX_RECOMPILER_OP_GCC) \ 
     374COMPILE_OP_CMDS_3 = $(VBOX_RECOMPILER_OP_GCC) \ 
    375375        -S -s \ 
    376376        $(filter-out -g -O0, \ 
     
    378378                $(target-i386/op.c_CFLAGS) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET_ARCH)) $(target-i386/op.c_CFLAGS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \ 
    379379                ) \ 
    380         $(addprefix -I,
     380        $(addprefix -I, $(abspathex
    381381                $($(REM_MOD)_CINCS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CINCS.$(KBUILD_TARGET)) $($(REM_MOD)_CINCS) $(CINCS) \ 
    382382                $($(REM_MOD)_INCS.$(KBUILD_TARGET_ARCH))  $($(REM_MOD)_INCS.$(KBUILD_TARGET))  $($(REM_MOD)_INCS) $(INCS) \ 
    383                 ) \ 
     383                , $($(REM_MOD)_PATH))) \ 
    384384        $(addprefix -D, \ 
    385385                $($(REM_MOD)_CDEFS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CDEFS.$(KBUILD_TARGET)) $($(REM_MOD)_CDEFS) $(CDEFS.$(KBUILD_TARGET)) $(CDEFS.$(KBUILD_TARGET_ARCH)) $(CDEFS.$(KBUILD_TYPE)) $(CDEFS) \ 
     
    389389        -Wp,-MT,$(PATH_$(REM_MOD))/op.S \ 
    390390        -Wp,-MP \ 
    391         target-i386/op.c 
     391        $(VBOX_PATH_RECOMPILER_SRC)/target-i386/op.c 
    392392 
    393393# Use the right GCC includes. 
    394394ifdef VBOX_RECOMPILER_OP_GCC_INCS 
    395 COMPILE_OP_CMDS := $(subst $(VBOX_PATH_GCC_INCS),$(VBOX_RECOMPILER_OP_GCC_INCS),$(COMPILE_OP_CMDS)) 
     395COMPILE_OP_CMDS_2 = $(subst $(VBOX_PATH_GCC_INCS),$(VBOX_RECOMPILER_OP_GCC_INCS),$(COMPILE_OP_CMDS_3)) 
     396else 
     397COMPILE_OP_CMDS_2 = $(COMPILE_OP_CMDS_3) 
    396398endif 
    397399 
     
    399401ifeq ($(KBUILD_TARGET),darwin) 
    400402 ifeq ($(filter-out i386-elf-gcc%, $(VBOX_RECOMPILER_OP_GCC)),) 
    401   COMPILE_OP_CMDS := $(filter-out -mdynamic-no-pic -mno-dynamic-no-pic -fno-stack-protector, $(COMPILE_OP_CMDS)) 
     403  COMPILE_OP_CMDS = $(filter-out -mdynamic-no-pic -mno-dynamic-no-pic -fno-stack-protector, $(COMPILE_OP_CMDS_2)) 
    402404 endif 
    403405else if1of ($(KBUILD_TARGET),linux) 
     
    407409    then echo "$(1)"; \ 
    408410    else echo "$(2)"; fi; ) 
    409   COMPILE_OP_CMDS := \ 
    410     $(filter-out -fno-stack-protector, $(COMPILE_OP_CMDS)) \ 
     411  COMPILE_OP_CMDS = \ 
     412    $(filter-out -fno-stack-protector, $(COMPILE_OP_CMDS_2)) \ 
    411413    $(call VBOX_RECOMPILER_OP_CHECK_CC_GCC,-fno-stack-protector) 
    412414 endif 
    413415endif 
     416COMPILE_OP_CMDS ?= $(COMPILE_OP_CMDS_2) 
    414417 
    415418# include the dependencies 
     
    424427                $(VBOX_PATH_RECOMPILER_SRC)/Sun/op-undefined.lst \ 
    425428                $(VBOX_PATH_RECOMPILER_SRC)/Makefile.kmk \ 
    426                 $(comp-cmds COMPILE_OP_CMDS,COMPILE_OP_CMDS_PREV,FORCE) \ 
     429                $$(comp-cmds COMPILE_OP_CMDS,COMPILE_OP_CMDS_PREV,FORCE) \ 
    427430                | $(call DIRDEP,$(PATH_$(REM_MOD))) 
    428431        $(RM) -f $@ $@.tmp $@.tmp2 $@.dep 

© 2008 Sun Microsystems, Inc.
ContactPrivacy policy