Changeset 10188 in vbox

Timestamp:

Jul 4, 2008 2:22:39 AM (16 years ago)

Author:

vboxsync

Message:

Converted to sub-makefile.

File:

• trunk/src/recompiler/Makefile.kmk (modified) (6 diffs)

trunk/src/recompiler/Makefile.kmk

@@ -372 +372 @@
 
 # The command sans -o op.S.tmp.
-COMPILE_OP_CMDS = $(VBOX_RECOMPILER_OP_GCC) \
+COMPILE_OP_CMDS_3 = $(VBOX_RECOMPILER_OP_GCC) \
         -S -s \
         $(filter-out -g -O0, \
@@ -378 +378 @@
                 $(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)) \
                 ) \
-        $(addprefix -I, \
+        $(addprefix -I, $(abspathex \
                 $($(REM_MOD)_CINCS.$(KBUILD_TARGET_ARCH)) $($(REM_MOD)_CINCS.$(KBUILD_TARGET)) $($(REM_MOD)_CINCS) $(CINCS) \
                 $($(REM_MOD)_INCS.$(KBUILD_TARGET_ARCH))  $($(REM_MOD)_INCS.$(KBUILD_TARGET))  $($(REM_MOD)_INCS) $(INCS) \
-                ) \
+                , $($(REM_MOD)_PATH))) \
         $(addprefix -D, \
                 $($(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) \
@@ -389 +389 @@
         -Wp,-MT,$(PATH_$(REM_MOD))/op.S \
         -Wp,-MP \
-        target-i386/op.c
+        $(VBOX_PATH_RECOMPILER_SRC)/target-i386/op.c
 
 # Use the right GCC includes.
 ifdef VBOX_RECOMPILER_OP_GCC_INCS
-COMPILE_OP_CMDS := $(subst $(VBOX_PATH_GCC_INCS),$(VBOX_RECOMPILER_OP_GCC_INCS),$(COMPILE_OP_CMDS))
+COMPILE_OP_CMDS_2 = $(subst $(VBOX_PATH_GCC_INCS),$(VBOX_RECOMPILER_OP_GCC_INCS),$(COMPILE_OP_CMDS_3))
+else
+COMPILE_OP_CMDS_2 = $(COMPILE_OP_CMDS_3)
 endif
 
@@ -399 +401 @@
 ifeq ($(KBUILD_TARGET),darwin)
  ifeq ($(filter-out i386-elf-gcc%, $(VBOX_RECOMPILER_OP_GCC)),)
-  COMPILE_OP_CMDS := $(filter-out -mdynamic-no-pic -mno-dynamic-no-pic -fno-stack-protector, $(COMPILE_OP_CMDS))
+  COMPILE_OP_CMDS = $(filter-out -mdynamic-no-pic -mno-dynamic-no-pic -fno-stack-protector, $(COMPILE_OP_CMDS_2))
  endif
 else if1of ($(KBUILD_TARGET),linux)
@@ -407 +409 @@
     then echo "$(1)"; \
     else echo "$(2)"; fi; )
-  COMPILE_OP_CMDS := \
-    $(filter-out -fno-stack-protector, $(COMPILE_OP_CMDS)) \
+  COMPILE_OP_CMDS = \
+    $(filter-out -fno-stack-protector, $(COMPILE_OP_CMDS_2)) \
     $(call VBOX_RECOMPILER_OP_CHECK_CC_GCC,-fno-stack-protector)
  endif
 endif
+COMPILE_OP_CMDS ?= $(COMPILE_OP_CMDS_2)
 
 # include the dependencies
@@ -424 +427 @@
                 $(VBOX_PATH_RECOMPILER_SRC)/Sun/op-undefined.lst \
                 $(VBOX_PATH_RECOMPILER_SRC)/Makefile.kmk \
-                $(comp-cmds COMPILE_OP_CMDS,COMPILE_OP_CMDS_PREV,FORCE) \
+                $$(comp-cmds COMPILE_OP_CMDS,COMPILE_OP_CMDS_PREV,FORCE) \
                 | $(call DIRDEP,$(PATH_$(REM_MOD)))
         $(RM) -f $@ [email protected] [email protected] [email protected]