From 25f1a573fdacef5131ecd2b06b9d0c00b0a8915f Mon Sep 17 00:00:00 2001 From: Xianyi Zhang Date: Sat, 7 Jul 2012 12:12:24 +0800 Subject: [PATCH] Fixed the build bug when DYNAMIC_ARCH=0. --- Makefile | 8 ++++---- Makefile.system | 4 ++-- driver/others/Makefile | 4 ++-- kernel/Makefile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 796217291..e538949db 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include ./Makefile.system BLASDIRS = interface driver/level2 driver/level3 driver/others -ifndef DYNAMIC_ARCH +ifneq ($(DYNAMIC_ARCH), 1) BLASDIRS += kernel endif @@ -147,7 +147,7 @@ ifeq ($(EXPRECISION), 1) echo "#define EXPRECISION">> config_last.h endif ## -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) $(MAKE) -C kernel commonlibs || exit 1 for d in $(DYNAMIC_CORE) ; \ do $(MAKE) GOTOBLAS_MAKEFILE= -C kernel TARGET_CORE=$$d kernel || exit 1 ;\ @@ -165,7 +165,7 @@ prof_blas : $(MAKE) -C $$d prof || exit 1 ; \ fi; \ done -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) $(MAKE) -C kernel commonprof || exit 1 endif @@ -184,7 +184,7 @@ hpl : $(MAKE) -C $$d $(@F) || exit 1 ; \ fi; \ done -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) $(MAKE) -C kernel commonlibs || exit 1 for d in $(DYNAMIC_CORE) ; \ do $(MAKE) GOTOBLAS_MAKEFILE= -C kernel TARGET_CORE=$$d kernel || exit 1 ;\ diff --git a/Makefile.system b/Makefile.system index 425cbb68a..e4b92539c 100644 --- a/Makefile.system +++ b/Makefile.system @@ -244,7 +244,7 @@ endif endif -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) ifeq ($(ARCH), x86) DYNAMIC_CORE = KATMAI COPPERMINE NORTHWOOD PRESCOTT BANIAS \ CORE2 PENRYN DUNNINGTON NEHALEM SANDYBRIDGE ATHLON OPTERON OPTERON_SSE3 BARCELONA BOBCAT ATOM NANO @@ -705,7 +705,7 @@ ifndef LIBSUFFIX LIBSUFFIX = a endif -ifndef DYNAMIC_ARCH +ifneq ($(DYNAMIC_ARCH), 1) ifndef SMP LIBNAME = $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX) LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX) diff --git a/driver/others/Makefile b/driver/others/Makefile index 2fdbb4a42..921f47c9c 100644 --- a/driver/others/Makefile +++ b/driver/others/Makefile @@ -14,7 +14,7 @@ endif # COMMONOBJS += info.$(SUFFIX) -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) COMMONOBJS += dynamic.$(SUFFIX) else COMMONOBJS += parameter.$(SUFFIX) @@ -70,7 +70,7 @@ ifndef BLAS_SERVER BLAS_SERVER = blas_server.c endif -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) dynamic.$(SUFFIX) else HPLOBJS = memory.$(SUFFIX) xerbla.$(SUFFIX) parameter.$(SUFFIX) diff --git a/kernel/Makefile b/kernel/Makefile index aed145b60..41c5e89fd 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -48,7 +48,7 @@ HPLOBJS = \ COMMONOBJS += lsame.$(SUFFIX) scabs1.$(SUFFIX) dcabs1.$(SUFFIX) -ifdef DYNAMIC_ARCH +ifeq ($(DYNAMIC_ARCH), 1) SBLASOBJS += setparam$(TSUFFIX).$(SUFFIX) CCOMMON_OPT += -DTS=$(TSUFFIX) endif