Rename a couple CFG_LIB_NAME vars in Makefile.in

This commit is contained in:
Graydon Hoare 2011-03-18 16:05:56 -07:00
parent 8ff77b14a9
commit c328ba1c54
1 changed files with 3 additions and 3 deletions

View File

@ -22,7 +22,7 @@ CFG_RUSTC_FLAGS := -nowarn
CFG_DSYMUTIL := true CFG_DSYMUTIL := true
ifeq ($(CFG_OSTYPE), FreeBSD) ifeq ($(CFG_OSTYPE), FreeBSD)
LIB := lib$(1).so CFG_LIB_NAME=lib$(1).so
CFG_GCC_CFLAGS += -fPIC -march=i686 -I/usr/local/include CFG_GCC_CFLAGS += -fPIC -march=i686 -I/usr/local/include
CFG_GCC_LINK_FLAGS += -shared -fPIC -lpthread -lrt CFG_GCC_LINK_FLAGS += -shared -fPIC -lpthread -lrt
ifeq ($(CFG_CPUTYPE), x86_64) ifeq ($(CFG_CPUTYPE), x86_64)
@ -33,7 +33,7 @@ ifeq ($(CFG_OSTYPE), FreeBSD)
endif endif
ifeq ($(CFG_OSTYPE), Linux) ifeq ($(CFG_OSTYPE), Linux)
LIB := lib$(1).so CFG_LIB_NAME=lib$(1).so
CFG_GCC_CFLAGS += -fPIC -march=i686 CFG_GCC_CFLAGS += -fPIC -march=i686
CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt CFG_GCC_LINK_FLAGS += -shared -fPIC -ldl -lpthread -lrt
ifeq ($(CFG_CPUTYPE), x86_64) ifeq ($(CFG_CPUTYPE), x86_64)
@ -44,7 +44,7 @@ ifeq ($(CFG_OSTYPE), Linux)
endif endif
ifeq ($(CFG_OSTYPE), Darwin) ifeq ($(CFG_OSTYPE), Darwin)
LIB := lib$(1).dylib CFG_LIB_NAME=lib$(1).dylib
CFG_UNIXY := 1 CFG_UNIXY := 1
CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread CFG_GCC_LINK_FLAGS += -dynamiclib -lpthread
# Darwin has a very blurry notion of "64 bit", and claims it's running # Darwin has a very blurry notion of "64 bit", and claims it's running