diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-29 18:47:40 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-29 19:53:08 +0200 |
| commit | 5753241d8869e7a3f64c535e4d23f125a7aed683 (patch) | |
| tree | 28a7f44343f5eeb4e01ae28918a31b0b09932d87 /solenv | |
| parent | d3f8bf8334bcc701aca2f4687530bde8f2c2c018 (diff) | |
move gb_Executable_EXT_for_build to platform/
Change-Id: Ica30efee4fcd030dcc063321ba678a00bec726cd
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 7 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 2 |
6 files changed, 6 insertions, 12 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index a82f98f7b4c8..866593d12f90 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) # defined by platform # 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) define gb_SrsPartTarget__command diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 9d521c79c092..395c9669f808 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -179,13 +179,6 @@ include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).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 # necessary to do it before we start including gbuild class makefiles, # so the classes can add dependencies on them. diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index f6cae6ad5f4f..a232b661eb93 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -521,6 +521,7 @@ endef # Executable class gb_Executable_EXT := .exe +gb_Executable_EXT_for_build := .exe gb_Executable_TARGETTYPEFLAGS := $(gb_Windows_PE_TARGETTYPEFLAGS) gb_Executable_get_rpath := diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index e03aa88a926e..0cc86e3c73d2 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -149,6 +149,10 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +# Executable class + +gb_Executable_EXT_for_build := + # Helper class ifeq ($(OS_FOR_BUILD),MACOSX) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 4b26f028fca9..47c12d2c1292 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_MKTEMP := mktemp -t gbuild.XXXXXX diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 0957e4a3d71b..d996bd46107d 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_Executable_EXT:= - include $(GBUILDDIR)/platform/com_GCC_defs.mk gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }') |