Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/18e8a7d4f5259615be5f64139c5d32bef6cfdfdf
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/18e8a7d4f5259615be5f64139c5d32bef6cfdfdf
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/18e8a7d4f5259615be5f64139c5d32bef6cfdfdf
The branch, master has been updated
via 18e8a7d4f5259615be5f64139c5d32bef6cfdfdf (commit)
from 3246c9f04267b117b4f464d9eef39b7ef7a70a7f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/buildsystem.git/commit/?id=18e8a7d4f5259615be5f64139c5d32bef6cfdfdf
commit 18e8a7d4f5259615be5f64139c5d32bef6cfdfdf
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
makefiles: Detect NS_ENV_CC and use that if set
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index c0e96d5..d998953 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -121,12 +121,17 @@ ifeq ($(BUILD),$(HOST))
else
# Cross compiling
- # Make first-stab at identity of CC
- CC__ := $(CC)
- # Improve our guess at the identity of CC
- # (only if CC was not specified by the user)
- ifeq ($(origin CC),default)
- CC__ := $(HOST)-gcc
+ ifneq ($(NS_ENV_CC),)
+ # If we have a CC specified by env.sh, start with that
+ CC__ := $(NS_ENV_CC)
+ else
+ # Make first-stab at identity of CC
+ CC__ := $(CC)
+ # Improve our guess at the identity of CC
+ # (only if CC was not specified by the user)
+ ifeq ($(origin CC),default)
+ CC__ := $(HOST)-gcc
+ endif
endif
# Search the path for the compiler
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index c0e96d5..d998953 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -121,12 +121,17 @@ ifeq ($(BUILD),$(HOST))
else
# Cross compiling
- # Make first-stab at identity of CC
- CC__ := $(CC)
- # Improve our guess at the identity of CC
- # (only if CC was not specified by the user)
- ifeq ($(origin CC),default)
- CC__ := $(HOST)-gcc
+ ifneq ($(NS_ENV_CC),)
+ # If we have a CC specified by env.sh, start with that
+ CC__ := $(NS_ENV_CC)
+ else
+ # Make first-stab at identity of CC
+ CC__ := $(CC)
+ # Improve our guess at the identity of CC
+ # (only if CC was not specified by the user)
+ ifeq ($(origin CC),default)
+ CC__ := $(HOST)-gcc
+ endif
endif
# Search the path for the compiler
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
