From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Thu, 2 Feb 2017 11:13:03 +0000 (+0100)
Subject: build: Pass -iremap gcc option as a single argument
X-Git-Tag: v17.01.5~290
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94f079e338d69f885645d2c99f235626b0ad2137;p=oweals%2Fopenwrt.git

build: Pass -iremap gcc option as a single argument

Passing -iremap argument separately causes problems with projects that
use scons and its ParseFlags function. Consider this SConscript
example:

    env = Environment()
    d = env.ParseFlags("-iremap one:two")

ParseFlags will interpret one:two as a file name and the returned dict
d will contain only "-iremap". When the -iremap is passed to the
compiler without an argument, compilation obviously fails.

Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
(cherry picked from commit 202ae4cc6a910dec2441c45dfdf5814ac4d82518)
---

diff --git a/rules.mk b/rules.mk
index 1ed80f11b8..743619ecff 100644
--- a/rules.mk
+++ b/rules.mk
@@ -130,7 +130,7 @@ else
 endif
 
 ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_GCC_VERSION_4_8),$(CONFIG_TARGET_uml)),)
-  iremap = -iremap $(1):$(2)
+  iremap = -iremap$(1):$(2)
 endif
 
 PACKAGE_DIR:=$(BIN_DIR)/packages