diff options
| author | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-01-04 14:32:19 -0600 |
|---|---|---|
| committer | Raptor Engineering Development Team <support@raptorengineering.com> | 2018-06-17 14:44:45 -0500 |
| commit | fc61f458e183997396da8a23f2b9a2a98b2300ce (patch) | |
| tree | bb07a6c8aff342bc84683dd95363df9105a50115 /tools/build/common.dir | |
| parent | c3af8769863ad300aca53591232462def5344de1 (diff) | |
| download | talos-hcode-06-18-2018.tar.gz talos-hcode-06-18-2018.zip | |
Allow split of HOST and TARGET toolchain binary names06-18-2018
Diffstat (limited to 'tools/build/common.dir')
| -rw-r--r-- | tools/build/common.dir/exe.rules.mk | 6 | ||||
| -rw-r--r-- | tools/build/common.dir/modules.rules.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/build/common.dir/exe.rules.mk b/tools/build/common.dir/exe.rules.mk index e187062e..3d1a02d0 100644 --- a/tools/build/common.dir/exe.rules.mk +++ b/tools/build/common.dir/exe.rules.mk @@ -81,10 +81,10 @@ $(EXEPATH)/$(EXE).exe: LOCALLDFLAGS += $$($(EXE)_LDFLAGS) $(EXEPATH)/$(EXE).exe: $$($(EXE)_PATH)/lib$(EXE).a \ $$(foreach lib,$$($(EXE)_DEPLIBS),$$($(EXE)_LIBPATH)/lib$$(lib).a) \ $$($(EXE)_EXTRALIBS) $$($(EXE)_DEPS) | $$($(EXE)_DEPSORDER) -$(call __CALL_LD,$$(or $$($(EXE)_TARGET),TARGET)) +$(call __CALL_LD,$$(or $$($(EXE)_HOST),HOST)) $$($(EXE)_PATH)/lib$(EXE).a: $$($(EXE)_OBJS) -$(call __CALL_AR,$$(or $$($(EXE)_TARGET),TARGET)) +$(call __CALL_AR,$$(or $$($(EXE)_HOST),HOST)) $(call __CLEAN_TARGET,$(EXEPATH)/$(EXE).exe) $(call __CLEAN_TARGET,$$($(EXE)_PATH)/lib$(EXE).a) @@ -128,7 +128,7 @@ __ADD_EXE_SRCDIR = \ # * Generate all the possible .C->.o, .c->.o, etc. pattern recipes. define ___ADD_EXE_SRCDIR $(call __ADD_EXE_INCDIR,$(1),$(2)) -$(call __GENERATE_OBJECTRULES,$(OBJPATH)/$(1),$(2),$$(or $$($(1)_TARGET),TARGET)) +$(call __GENERATE_OBJECTRULES,$(OBJPATH)/$(1),$(2),$$(or $$($(1)_HOST),HOST)) endef # ADD_EXE_INCDIR diff --git a/tools/build/common.dir/modules.rules.mk b/tools/build/common.dir/modules.rules.mk index ed6bb7f1..eab8f130 100644 --- a/tools/build/common.dir/modules.rules.mk +++ b/tools/build/common.dir/modules.rules.mk @@ -87,7 +87,7 @@ $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).so: LOCALLDFLAGS += $$(lib$(MODULE)_LDFLAG $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).so: $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).a \ $$(foreach lib,$$(lib$(MODULE)_DEPLIBS),$$$$(lib$(MODULE)_LIBPATH)/lib$$(lib).a ) \ $$(lib$(MODULE)_EXTRALIBS) | $$(lib$(MODULE)_DEPSORDER) -$(call __CALL_LDSO,$$(or $$(lib$(MODULE)_TARGET),TARGET)) +$(call __CALL_LDSO,$$(or $$(lib$(MODULE)_HOST),HOST)) $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).a: LOCALCOMMONFLAGS += $$(lib$(MODULE)_COMMONFLAGS) $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).a: LOCALCFLAGS += $$(lib$(MODULE)_CFLAGS) @@ -96,7 +96,7 @@ $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).a: LOCALLDFLAGS += $$(lib$(MODULE)_LDFLAGS $$(lib$(MODULE)_LIBPATH)/lib$(MODULE).a: $$(lib$(MODULE)_OBJS) -$(call __CALL_AR,$$(or $$(lib$(MODULE)_TARGET),TARGET)) +$(call __CALL_AR,$$(or $$(lib$(MODULE)_HOST),HOST)) $(call __CLEAN_TARGET,$$(lib$(MODULE)_LIBPATH)/lib$(MODULE).so) $(call __CLEAN_TARGET,$$(lib$(MODULE)_LIBPATH)/lib$(MODULE).a) @@ -141,7 +141,7 @@ __ADD_MODULE_SRCDIR = \ # * Generate all the possible .C->.o, .c->.o, etc. pattern recipes. define ___ADD_MODULE_SRCDIR $(call __ADD_MODULE_INCDIR,$(1),$(2)) -$(call __GENERATE_OBJECTRULES,$(OBJPATH)/$(1),$(2),$$(or $$(lib$(1)_TARGET),TARGET)) +$(call __GENERATE_OBJECTRULES,$(OBJPATH)/$(1),$(2),$$(or $$(lib$(1)_HOST),HOST)) endef # ADD_MODULE_INCDIR |
