Skip to content

Commit eb562fa

Browse files
committed
Merge branch 'gh/60' into 'master'
Let makefile.setup override default values for some variables See merge request eng/toolchain/templates-parser!3
2 parents 6c3ff87 + 2560047 commit eb562fa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ else
4242
TP_XMLADA := Disabled
4343
endif
4444

45-
-include makefile.setup
46-
4745
ifeq ($(HOST), $(TARGET))
4846
GPROPTS =
4947
TPREFIX=$(DESTDIR)$(prefix)
@@ -110,6 +108,8 @@ endif
110108
endif
111109
endif
112110

111+
-include makefile.setup
112+
113113
ALL_OPTIONS := \
114114
DEBUG \
115115
DEFAULT_LIBRARY_TYPE \

0 commit comments

Comments
 (0)