Changeset 1700 in vbox for trunk/src/recompiler/new

Timestamp:

Mar 26, 2007 12:26:57 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

19850

Message:

Permit 4.1.x+.

File:

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

trunk/src/recompiler/new/Makefile.kmk

@@ -315 +315 @@
 # in one (or more) ELF op.o files using nm.
 #
-ifeq ($(USERNAME).$(BUILD_TARGET),bird.linux)
- VBOX_RECOMPILER_OP_GCC ?= $(TOOL_$(VBOX_GCC_TOOL)_CC)  # gcc 4.1.1 works fine for me.
-endif
 ifndef VBOX_RECOMPILER_OP_GCC
  ifeq ($(BUILD_TARGET).$(BUILD_TARGET_ARCH),darwin.x86)
@@ -382 +379 @@
         $(call MSG_L1,Compiling $< => $@)
         $(addsuffix $(SP)\$(NL)$(TAB)  ,$(COMPILE_OP_CMDS)) -o [email protected]
-else ifeq ($(VBOX_RECOMPILER_OP_GCC_OK),dunno)
+else ifeq ($(VBOX_RECOMPILER_OP_GCC_OK),dunno) # (permit 3.x.x and 4.1.x+ for now)
         major_ver=`$(VBOX_RECOMPILER_OP_GCC) --version | $(SED) -e '/GCC/!d' -e 's/^.* (GCC) \([2-9]\)\..*$$/\1/'`; \
-        if test "$$major_ver" = "3"; then \
+        minor_ver=`$(VBOX_RECOMPILER_OP_GCC) --version | $(SED) -e '/GCC/!d' -e 's/^.* (GCC) \([2-9]\)\.\([2-9]\)\..*$$/\2/'`; \
+        if test "$$major_ver" = "3" -o "(" "$$major_ver" = "4" -a "$$minor_ver" != "0" ")"; then \
                 $(ECHO_EXT) "Compiling $< => $@" && \
                 $(addsuffix $(SP)\$(NL)$(TAB)$(TAB)  ,$(COMPILE_OP_CMDS)) -o [email protected]; \
         else \
-                $(ECHO_EXT) "Using staged op.S (gcc major ver $$major_ver)" && \
+                $(ECHO_EXT) "Using staged op.S (gcc ver $$major_ver.$$minor_ver)" && \
                 $(CP_EXT) -f staged/op-elf-$(BUILD_TARGET_ARCH).S [email protected]; \
         fi