build fixes

com.oracle.truffle.r.native/fficall/jni/Makefile

@@ -25,7 +25,6 @@ ifeq ($(TOPDIR),)
     TOPDIR = $(abspath ../..)
 endif
 
-$(warning $(TOPDIR))
 include $(TOPDIR)/platform.mk
 
 .PHONY: all clean

com.oracle.truffle.r.test.native/urand/Makefile

@@ -24,10 +24,8 @@
 ifeq ($(TOPDIR),)
     TOPDIR = $(abspath ..)
 endif
-$(warning  $(TOPDIR))
 
 NATIVE_PROJECT = $(subst test.native,native,$(TOPDIR))
-$(warning $(NATIVE_PROJECT))
 
 include $(NATIVE_PROJECT)/platform.mk
 

mx.fastr/mx_fastr.py

@@ -64,7 +64,13 @@ def _set_libpath():
 def build(args):
     '''FastR build'''
     # Overridden in case we ever want to do anything non-standard
-    mx_graal.build(args) # this calls mx.build
+    # workaround for Hotspot Mac OS X build problem
+    osname = platform.system()
+    if osname == 'Darwin':
+        os.environ['COMPILER_WARNINGS_FATAL'] = 'false'
+        os.environ['USE_CLANG'] = 'true'
+        os.environ['LFLAGS'] = '-Xlinker -lstdc++'
+    mx_graal.build(args, vm='server') # this calls mx.build
 
 def findbugs(args):
     '''run FindBugs against non-test Java projects'''
@@ -102,12 +108,6 @@ def findbugs(args):
 def _fastr_gate_body(args, tasks):
     _check_autogen_tests(False)
 
-    # workaround for Hotspot Mac OS X build problem
-    osname = platform.system()
-    if osname == 'Darwin':
-        os.environ['COMPILER_WARNINGS_FATAL'] = 'false'
-        os.environ['USE_CLANG'] = 'true'
-        os.environ['LFLAGS'] = '-Xlinker -lstdc++'
 
     t = mx_graal.Task('BuildHotSpotGraalServer: product')
     mx_graal.buildvms(['--vms', 'server', '--builds', 'product'])