Kaydet (Commit) 5753241d authored tarafından Matúš Kukan's avatar Matúš Kukan

move gb_Executable_EXT_for_build to platform/

Change-Id: Ica30efee4fcd030dcc063321ba678a00bec726cd
üst d3f8bf83
...@@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) ...@@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
# defined by platform # defined by platform
# gb_SrsPartTarget__command_dep # gb_SrsPartTarget__command_dep
gb_ResTarget_RSCTARGET := $(OUTDIR_FOR_BUILD)/bin/rsc$(gb_Executable_EXT_for_build) gb_ResTarget_RSCTARGET := $(call gb_Executable_get_target_for_build,rsc)
gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET) gb_ResTarget_RSCCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_ResTarget_RSCTARGET)
define gb_SrsPartTarget__command define gb_SrsPartTarget__command
......
...@@ -179,13 +179,6 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk ...@@ -179,13 +179,6 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
include $(SRCDIR)/RepositoryFixes.mk include $(SRCDIR)/RepositoryFixes.mk
ifeq ($(CROSS_COMPILING),YES)
# We can safely Assume all cross-compilation is from Unix systems.
gb_Executable_EXT_for_build :=
else
gb_Executable_EXT_for_build := $(gb_Executable_EXT)
endif
# Set up build tools that can be either internal or system. It is # Set up build tools that can be either internal or system. It is
# necessary to do it before we start including gbuild class makefiles, # necessary to do it before we start including gbuild class makefiles,
# so the classes can add dependencies on them. # so the classes can add dependencies on them.
......
...@@ -521,6 +521,7 @@ endef ...@@ -521,6 +521,7 @@ endef
# Executable class # Executable class
gb_Executable_EXT := .exe gb_Executable_EXT := .exe
gb_Executable_EXT_for_build := .exe
gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS)
gb_Executable_get_rpath := gb_Executable_get_rpath :=
......
...@@ -149,6 +149,10 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) ...@@ -149,6 +149,10 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC)))
gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
# Executable class
gb_Executable_EXT_for_build :=
# Helper class # Helper class
ifeq ($(OS_FOR_BUILD),MACOSX) ifeq ($(OS_FOR_BUILD),MACOSX)
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# #
#************************************************************************* #*************************************************************************
gb_Executable_EXT:=
include $(GBUILDDIR)/platform/com_GCC_defs.mk include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_MKTEMP := mktemp -t gbuild.XXXXXX gb_MKTEMP := mktemp -t gbuild.XXXXXX
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
# #
#************************************************************************* #*************************************************************************
gb_Executable_EXT:=
include $(GBUILDDIR)/platform/com_GCC_defs.mk include $(GBUILDDIR)/platform/com_GCC_defs.mk
gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }') gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment