Browse Source

Compute DEP_PATH in dep.mk without checking whether the directory

exists
tags/v0.6.2
Andrew Belt 6 years ago
parent
commit
f33b42a3de
1 changed files with 9 additions and 6 deletions
  1. +9
    -6
      dep.mk

+ 9
- 6
dep.mk View File

@@ -2,11 +2,14 @@ include $(RACK_DIR)/arch.mk


# The install location for `make install` # The install location for `make install`
DEP_LOCAL ?= . DEP_LOCAL ?= .
DEP_PATH := $(shell pwd)/$(DEP_LOCAL)

DEP_FLAGS += -g -O3 -march=nocona DEP_FLAGS += -g -O3 -march=nocona


ifeq ($(ARCH), mac) ifeq ($(ARCH), mac)
DEP_FLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
DEP_LDFLAGS += -mmacosx-version-min=10.7 -stdlib=libc++
DEP_MAC_SDK_FLAGS := -mmacosx-version-min=10.7
DEP_FLAGS += $(DEP_MAC_SDK_FLAGS) -stdlib=libc++
DEP_LDFLAGS += $(DEP_MAC_SDK_FLAGS) -stdlib=libc++
endif endif


DEP_CFLAGS += $(DEP_FLAGS) DEP_CFLAGS += $(DEP_FLAGS)
@@ -16,11 +19,11 @@ DEP_CXXFLAGS += $(DEP_FLAGS)
WGET := wget -c WGET := wget -c
UNTAR := tar xf UNTAR := tar xf
UNZIP := unzip -o UNZIP := unzip -o
CONFIGURE := ./configure --prefix="$(realpath $(DEP_LOCAL))"
ifeq ($(ARCH), win)
CMAKE := cmake -G 'MSYS Makefiles' -DCMAKE_INSTALL_PREFIX="$(realpath $(DEP_LOCAL))"
CONFIGURE := ./configure --prefix="$(DEP_PATH)"
ifdef ARCH_WIN
CMAKE := cmake -G 'MSYS Makefiles' -DCMAKE_INSTALL_PREFIX="$(DEP_PATH)"
else else
CMAKE := cmake -DCMAKE_INSTALL_PREFIX="$(realpath $(DEP_LOCAL))"
CMAKE := cmake -DCMAKE_INSTALL_PREFIX="$(DEP_PATH)"
endif endif


# Export environment for all dependency targets # Export environment for all dependency targets


Loading…
Cancel
Save