Fix Windows builds
The windows shell doesn't like commands that start ../ Those commands are all found using TOOLS, so by making that an absolute path we fix that problem. However GNUmake doesn't recognize targets with relative paths as being the same as their absolute path, so we have to fix up some places that were using TOOLS in dependencies.
This commit is contained in:
@@ -52,8 +52,9 @@ BASE_CPPFLAGS += $(OSITHREAD_DEFAULT_STACK_FLAGS_$(OSITHREAD_USE_DEFAULT_STACK))
|
||||
|
||||
#---------------------------------------------------------------
|
||||
# Where to find the installed build tools
|
||||
# Windows does not like commands with relative paths starting ../
|
||||
|
||||
TOOLS = $(EPICS_BASE_HOST_BIN)
|
||||
TOOLS = $(abspath $(EPICS_BASE_HOST_BIN))
|
||||
|
||||
#---------------------------------------------------------------
|
||||
# Epics base build tools and tool flags
|
||||
|
||||
@@ -79,9 +79,9 @@ dbMapper$(DEP): $(COMMON_DIR)/gddApps.h
|
||||
|
||||
# Rules for generated files
|
||||
#
|
||||
$(COMMON_DIR)/aitConvertGenerated.cc: $(TOOLS)/aitGen$(HOSTEXE)
|
||||
$(COMMON_DIR)/aitConvertGenerated.cc: $(EPICS_BASE_HOST_BIN)/aitGen$(HOSTEXE)
|
||||
$(TOOLS)/aitGen$(HOSTEXE) $@
|
||||
|
||||
$(COMMON_DIR)/gddApps.h : $(TOOLS)/genApps$(HOSTEXE)
|
||||
$(COMMON_DIR)/gddApps.h : $(EPICS_BASE_HOST_BIN)/genApps$(HOSTEXE)
|
||||
$(TOOLS)/genApps$(HOSTEXE) $@
|
||||
|
||||
|
||||
+1
-1
@@ -12,5 +12,5 @@
|
||||
# This is a Makefile fragment, see src/ioc/Makefile.
|
||||
|
||||
$(patsubst %,$(COMMON_DIR)/%,$(BPT_DBD)) : \
|
||||
$(COMMON_DIR)/bpt%.dbd : $(TOOLS)/makeBpt$(HOSTEXE)
|
||||
$(COMMON_DIR)/bpt%.dbd : $(EPICS_BASE_HOST_BIN)/makeBpt$(HOSTEXE)
|
||||
|
||||
|
||||
+2
-2
@@ -16,6 +16,6 @@ asLib$(DEP): asLib_lex.c
|
||||
asLib.c: asLib_lex.c
|
||||
|
||||
# Ensure that lexer and parser are built before they are needed
|
||||
asLib.c: $(TOOLS)/antelope$(HOSTEXE)
|
||||
asLib_lex.c: $(TOOLS)/e_flex$(HOSTEXE)
|
||||
asLib.c: $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)
|
||||
asLib_lex.c: $(EPICS_BASE_HOST_BIN)/e_flex$(HOSTEXE)
|
||||
asLib_lex.c: $(INSTALL_INCLUDE)/flex.skel.static
|
||||
|
||||
@@ -10,4 +10,4 @@
|
||||
# This is a Makefile fragment, see src/libCom/Makefile.
|
||||
|
||||
# Ensure that the lexer is built before it is needed
|
||||
parse.c: $(TOOLS)/antelope$(HOSTEXE)
|
||||
parse.c: $(EPICS_BASE_HOST_BIN)/antelope$(HOSTEXE)
|
||||
|
||||
Reference in New Issue
Block a user