Ticket #68730: Makefile.in.rej

File Makefile.in.rej, 809 bytes (added by tehcog (tehcog), 12 months ago)

makefile frag

Line 
1***************
2*** 643,648 ****
3  @host_makefile_frag@
4  ###
5 
6  # Allow host makefile fragment to override PIE settings.
7  ifneq ($(STAGE1_NO_PIE_CFLAGS),)
8        HOST_EXPORTS += export NO_PIE_CFLAGS="$(STAGE1_NO_PIE_CFLAGS)";
9--- 643,654 ----
10  @host_makefile_frag@
11  ###
12 
13+ # override MacPorts cctools modifications to allow standard gas assembler  to be used
14+ HOST_EXPORTS            += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
15+ HOST_EXPORTS            += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
16+ POSTSTAGE1_HOST_EXPORTS += export DISABLE_MACPORTS_AS_CLANG_SEARCH=1;
17+ POSTSTAGE1_HOST_EXPORTS += export DISABLE_XCODE_AS_CLANG_SEARCH=1;
18+
19  # Allow host makefile fragment to override PIE settings.
20  ifneq ($(STAGE1_NO_PIE_CFLAGS),)
21        HOST_EXPORTS += export NO_PIE_CFLAGS="$(STAGE1_NO_PIE_CFLAGS)";