valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 01:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix #2698] Use build/darwin for all OS X builds (#2710)

Browse Source
This commit is contained in:
Teddy Reed 2016-11-02 20:31:16 -07:00 committed by GitHub
parent afbde7641a
commit 06567e7597
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -15,11 +15,7 @@ endif
DISTRO := $(shell . ./tools/lib.sh; _platform) DISTRO := $(shell . ./tools/lib.sh; _platform)
DISTRO_VERSION := $(shell . ./tools/lib.sh; _distro $(DISTRO)) DISTRO_VERSION := $(shell . ./tools/lib.sh; _distro $(DISTRO))
ifeq ($(DISTRO),darwin) ifeq ($(DISTRO),darwin)
ifeq ($(DISTRO_VERSION), 10.11) BUILD_DIR = darwin$(DISTRO_VERSION)
BUILD_DIR = darwin
else
BUILD_DIR = darwin$(DISTRO_VERSION)
endif
else ifeq ($(DISTRO),freebsd) else ifeq ($(DISTRO),freebsd)
BUILD_DIR = freebsd$(DISTRO_VERSION) BUILD_DIR = freebsd$(DISTRO_VERSION)
else else
@ -129,7 +125,10 @@ strip: .setup
distclean: distclean:
rm -rf .sources build/$(BUILD_DIR) build/debug_$(BUILD_DIR) build/docs rm -rf .sources build/$(BUILD_DIR) build/debug_$(BUILD_DIR) build/docs
ifeq ($(PLATFORM),Linux) ifeq ($(PLATFORM),Linux)
rm -rf build/linux rm -rf build/linux build/debug_linux
endif
ifeq ($(PLATFORM),Darwin)
rm -rf build/darwin build/debug_darwin
endif endif
depsclean: depsclean:
@ -157,6 +156,10 @@ endif
ifeq ($(PLATFORM),Linux) ifeq ($(PLATFORM),Linux)
@ln -snf $(BUILD_DIR) build/linux @ln -snf $(BUILD_DIR) build/linux
@ln -snf debug_$(BUILD_DIR) build/debug_linux @ln -snf debug_$(BUILD_DIR) build/debug_linux
endif
ifeq ($(PLATFORM),Darwin)
@ln -sfn $(BUILD_DIR) build/darwin
@ln -sfn debug_$(BUILD_DIR) build/debug_darwin
endif endif
@export PYTHONPATH="$DEPS_DIR/lib/python2.7/site-packages" @export PYTHONPATH="$DEPS_DIR/lib/python2.7/site-packages"