Permalink
Browse files

improve FreeBSD build

  • Loading branch information...
1 parent e92a797 commit 84882a5e30fccd929fe5228559ca6c782a95a1c4 @nolta nolta committed May 20, 2012
Showing with 10 additions and 5 deletions.
  1. +5 −2 Make.inc
  2. +2 −2 deps/Makefile
  3. +1 −1 deps/amos/Makefile
  4. +2 −0 deps/install-name-FreeBSD.sh
View
@@ -37,9 +37,12 @@ JFFLAGS = -O2 $(fPIC)
USEGCC = 1
USECLANG = 0
+GCC = gcc
+GPLUSPLUS = g++
+
ifeq ($(USEGCC),1)
-CC = gcc
-CXX = g++
+CC = $(GCC)
+CXX = $(GPLUSPLUS)
JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
JCXXFLAGS = -pipe $(fPIC) -fno-rtti
DEBUGFLAGS = -ggdb3 -DDEBUG
View
@@ -135,7 +135,7 @@ llvm-$(LLVM_VER)/configure: llvm-$(LLVM_VER).tar.gz
touch $@
$(LLVM_OBJ_SOURCE): llvm-$(LLVM_VER)/configure
cd llvm-$(LLVM_VER) && \
- ./configure --prefix=$(abspath $(USR)) --disable-threads --enable-optimized --disable-profiling --disable-assertions --enable-shared --enable-targets=x86,x86_64 --disable-bindings --disable-docs CC=gcc CXX=g++ && \
+ ./configure --prefix=$(abspath $(USR)) --disable-threads --enable-optimized --disable-profiling --disable-assertions --enable-shared --enable-targets=x86,x86_64 --disable-bindings --disable-docs CC=$(GCC) CXX=$(GPLUSPLUS) && \
$(MAKE)
$(LLVM_OBJ_TARGET): $(LLVM_OBJ_SOURCE)
$(MAKE) -C llvm-$(LLVM_VER) install
@@ -485,7 +485,7 @@ $(ARPACK_OBJ_SOURCE): arpack-ng_$(ARPACK_VER)/configure $(OPENBLAS_OBJ_SOURCE)
$(ARPACK_OBJ_TARGET): $(ARPACK_OBJ_SOURCE)
mkdir -p $(USRLIB)
cd arpack-ng_$(ARPACK_VER) && \
- make install F77=$(FC) MPIF77=$(FC)
+ $(MAKE) install F77=$(FC) MPIF77=$(FC)
touch $@
clean-arpack:
View
@@ -1,4 +1,4 @@
-FC = gfortran
+include ../../Make.inc
FFLAGS = -O2 -fPIC
@@ -0,0 +1,2 @@
+#!/bin/sh
+

0 comments on commit 84882a5

Please sign in to comment.