Merge branch 'master' of github.com:JuliaLang/julia

jiahao · May 26, 2015 · 7773b75 · 7773b75
2 parents a85357a + 116238c
commit 7773b75
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Make.inc b/Make.inc
@@ -251,7 +251,6 @@ STDLIBCPP_FLAG =
 ifeq ($(OS), Darwin)
 DARWINVER := $(shell uname -r | cut -b 1-2)
 DARWINVER_GTE13 := $(shell expr `uname -r | cut -b 1-2` \>= 13)
-OSXVER := $(shell sw_vers -productVersion | cut -b 1-4)
 ifeq ($(DARWINVER), 10) # Snow Leopard specific configuration
 USEGCC = 1
 USECLANG = 0
@@ -467,7 +466,6 @@ endif
 endif
 
 JULIA_CPU_TARGET ?= native
-JCPPFLAGS += -DJULIA_TARGET_ARCH=$(JULIA_CPU_TARGET)
 
 # We map amd64 to x86_64 for compatibility with systems that identify 64-bit systems as such
 ifeq ($(ARCH),amd64)

diff --git a/contrib/check-whitespace.sh b/contrib/check-whitespace.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 # This file is a part of Julia. License is MIT: http:https://julialang.org/license
 
 # Check for trailing white space in source files;

diff --git a/test/perf/micro/java/setup.sh b/test/perf/micro/java/setup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This file is a part of Julia. License is MIT: http:https://julialang.org/license
 
 mvn compile exec:java