Skip to content

Commit

Permalink
some makefile improvements (quieter no-op, re-enable fftw tests, impr…
Browse files Browse the repository at this point in the history
…ove setting of -march flag on Darwin)
  • Loading branch information
vtjnash committed Jul 12, 2014
1 parent 8627fa9 commit 5e6f4aa
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
15 changes: 15 additions & 0 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,22 @@ CC += -march=$(MARCH)
CXX += -march=$(MARCH)
FC += -march=$(MARCH)
JULIA_CPU_TARGET ?= $(MARCH)
ifeq ($(OS),Darwin)
# on Darwin, the standalone `as` program doesn't know
# how to handle AVX instructions, but it does know how
# to dispatch to the clang assembler (if we ask it to)
ifeq ($(USECLANG),1)
CC += -integrated-as
CXX += -integrated-as
else
CC += -Wa,-q
CXX += -Wa,-q
endif
FC += -Wa,-q
AS += -q
endif
endif

JULIA_CPU_TARGET ?= native
JCPPFLAGS += -DJULIA_TARGET_ARCH=$(JULIA_CPU_TARGET)

Expand Down
10 changes: 4 additions & 6 deletions deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1101,8 +1101,7 @@ $(FFTW_SINGLE_SRC_TARGET): fftw-$(FFTW_VER)-single/config.status
$(MAKE) -C fftw-$(FFTW_VER)-single
fftw-$(FFTW_VER)-single/checked: $(FFTW_SINGLE_SRC_TARGET)
ifeq ($(OS),$(BUILD_OS))
# $(MAKE) -C fftw-$(FFTW_VER)-single check
$(MAKE) -C fftw-$(FFTW_VER)-single
$(MAKE) -C fftw-$(FFTW_VER)-single check
endif
echo 1 > $@
$(FFTW_SINGLE_OBJ_TARGET): $(FFTW_SINGLE_SRC_TARGET) fftw-$(FFTW_VER)-single/checked
Expand Down Expand Up @@ -1141,8 +1140,7 @@ $(FFTW_DOUBLE_SRC_TARGET): fftw-$(FFTW_VER)-double/config.status
touch -c $@
fftw-$(FFTW_VER)-double/checked: $(FFTW_DOUBLE_SRC_TARGET)
ifeq ($(OS),$(BUILD_OS))
# $(MAKE) -C fftw-$(FFTW_VER)-double check
$(MAKE) -C fftw-$(FFTW_VER)-double
$(MAKE) -C fftw-$(FFTW_VER)-double check
endif
echo 1 > $@
$(FFTW_DOUBLE_OBJ_TARGET): $(FFTW_DOUBLE_SRC_TARGET) fftw-$(FFTW_VER)-double/checked
Expand Down Expand Up @@ -1178,8 +1176,8 @@ configure-fftw: configure-fftw-single configure-fftw-double
compile-fftw: compile-fftw-single compile-fftw-double
check-fftw: check-fftw-single check-fftw-double
install-fftw: check-fftw-single check-fftw-double
$(MAKE) install-fftw-single
$(MAKE) install-fftw-double
@$(MAKE) -s install-fftw-single
@$(MAKE) -s install-fftw-double

get-fftw-single: fftw-$(FFTW_VER).tar.gz
configure-fftw-single: fftw-$(FFTW_VER)-single/config.status
Expand Down

0 comments on commit 5e6f4aa

Please sign in to comment.