1.1 --- a/make/bsd/makefiles/buildtree.make Fri Nov 18 15:15:54 2011 -0800
1.2 +++ b/make/bsd/makefiles/buildtree.make Mon Dec 05 14:55:16 2011 -0800
1.3 @@ -55,6 +55,9 @@
1.4 # The makefiles are split this way so that "make foo" will run faster by not
1.5 # having to read the dependency files for the vm.
1.6
1.7 +# needs to be set here since this Makefile doesn't include defs.make
1.8 +OS_VENDOR:=$(shell uname -s)
1.9 +
1.10 include $(GAMMADIR)/make/scm.make
1.11 include $(GAMMADIR)/make/altsrc.make
1.12
1.13 @@ -159,8 +162,15 @@
1.14 endif
1.15 endif
1.16
1.17 -# MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
1.18 -ifdef ALWAYS_PASS_TEST_GAMMA
1.19 +ifeq ($(OS_VENDOR), Darwin)
1.20 + # MACOSX FIXME: we should be able to run test_gamma (see MACOSX_PORT-214)
1.21 + ifeq ($(ALWAYS_PASS_TEST_GAMMA),)
1.22 + # ALWAYS_PASS_TEST_GAMMA wasn't set so we default to true on MacOS X
1.23 + # until MACOSX_PORT-214 is fixed
1.24 + ALWAYS_PASS_TEST_GAMMA=true
1.25 + endif
1.26 +endif
1.27 +ifeq ($(ALWAYS_PASS_TEST_GAMMA), true)
1.28 TEST_GAMMA_STATUS= echo 'exit 0';
1.29 else
1.30 TEST_GAMMA_STATUS=
