| 12345678910111213141516171819202122232425262728 |
- From 9b2170627a87edee98f307f1ba44866e78b05098 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
- Date: Wed, 15 Jan 2014 15:15:12 +0100
- Subject: [PATCH 13/19] contrib: don't try to guess ARCH if it was given as an
- argument
- ---
- contrib/src/main.mak | 2 ++
- 1 file changed, 2 insertions(+)
- diff --git a/contrib/src/main.mak b/contrib/src/main.mak
- index a22b717..149baa0 100644
- --- a/contrib/src/main.mak
- +++ b/contrib/src/main.mak
- @@ -35,7 +35,9 @@ PREFIX := $(abspath $(PREFIX))
- ifneq ($(HOST),$(BUILD))
- HAVE_CROSS_COMPILE = 1
- endif
- +ifndef ARCH
- ARCH := $(shell $(SRC)/get-arch.sh $(HOST))
- +endif
-
- ifeq ($(ARCH)-$(HAVE_WIN32),x86_64-1)
- HAVE_WIN64 := 1
- --
- 1.8.3.4 (Apple Git-47)
|
