Created
January 20, 2017 23:13
-
-
Save starius/5fdc1386c716c9b3ce960f40a05ea9aa to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From b287c203474f75df6a33b0bfa35c961fae6e32f9 Mon Sep 17 00:00:00 2001 | |
From: Boris Nagaev <bnagaev@gmail.com> | |
Date: Sun, 30 Oct 2016 22:29:33 +0100 | |
Subject: [PATCH] Makefile: refactor definitions of some variables | |
--- | |
Makefile | 6 +++--- | |
1 file changed, 3 insertions(+), 3 deletions(-) | |
diff --git a/Makefile b/Makefile | |
index d0286de4..a758cb8e 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -552,7 +552,7 @@ build-only-$(1)_$(3): PKG = $(1) | |
build-only-$(1)_$(3): TARGET = $(3) | |
build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE | |
build-only-$(1)_$(3): BUILD_$(if $(call seq,$(TARGET),$(BUILD)),NATIVE,CROSS) = TRUE | |
-build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a) | |
+build-only-$(1)_$(3): LIB_SUFFIX = $(if $$(BUILD_SHARED),dll,a) | |
build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32) | |
build-only-$(1)_$(3): BUILD_TYPE = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),debug,release) | |
build-only-$(1)_$(3): BUILD_TYPE_SUFFIX = $(if $(findstring debug,$(3) $($(1)_CONFIGURE_OPTS)),d) | |
@@ -564,8 +564,8 @@ build-only-$(1)_$(3): TEST_FILE = $($(1)_TEST_FILE) | |
build-only-$(1)_$(3): CMAKE_RUNRESULT_FILE = $(PREFIX)/share/cmake/modules/TryRunResults.cmake | |
build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake | |
build-only-$(1)_$(3): CMAKE_TOOLCHAIN_DIR = $(PREFIX)/$(3)/share/cmake/mxe-conf.d | |
-build-only-$(1)_$(3): CMAKE_STATIC_BOOL = $(if $(findstring shared,$(3)),OFF,ON) | |
-build-only-$(1)_$(3): CMAKE_SHARED_BOOL = $(if $(findstring shared,$(3)),ON,OFF) | |
+build-only-$(1)_$(3): CMAKE_STATIC_BOOL = $(if $$(BUILD_STATIC),ON,OFF) | |
+build-only-$(1)_$(3): CMAKE_SHARED_BOOL = $(if $$(BUILD_SHARED),ON,OFF) | |
build-only-$(1)_$(3): | |
$(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), | |
uname -a | |
-- | |
2.11.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment