Skip to content
This repository has been archived by the owner on Sep 14, 2018. It is now read-only.

Commit

Permalink
allow for build directory different than source directory
Browse files Browse the repository at this point in the history
sthalik committed Aug 13, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 024edce commit e39e894
Showing 14 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion cctools/ar/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bin_PROGRAMS = ar
ar_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

ar_CFLAGS = -D__DARWIN_UNIX03 -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEF) $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/as/Makefile.am
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ SUBDIRS=arm i386 x86_64 ppc ppc64

bin_PROGRAMS = as
as_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/as/arm/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libexec_PROGRAMS = arm-as

arm_as_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

arm_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DARM $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/as/i386/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libexec_PROGRAMS = i386-as

i386_as_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

i386_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DI386 -Di486 -Di586 -Di686 -UPPC $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/as/ppc/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libexec_PROGRAMS = ppc-as

ppc_as_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

ppc_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DPPC $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/as/ppc64/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libexec_PROGRAMS = ppc64-as

ppc64_as_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

ppc64_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DPPC -DARCH64 $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/as/x86_64/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
libexec_PROGRAMS = x86_64-as

x86_64_as_LDADD = \
$(top_srcdir)/libstuff/libstuff.la
$(top_builddir)/libstuff/libstuff.la

x86_64_as_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff -I$(top_srcdir)/as $(WARNINGS) $(LTO_DEF) -DNeXT_MOD -DASLIBEXECDIR="\"$(ASLIBEXECDIR)/\"" -D__DARWIN_UNIX03 -DI386 -Di486 -Di586 -Di686 -DARCH64 $(ENDIAN_FLAG)

2 changes: 1 addition & 1 deletion cctools/ld/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
bin_PROGRAMS = ld_classic
ld_classic_LDADD = \
$(top_srcdir)/libstuff/libstuff.la $(UUID_LIB)
$(top_builddir)/libstuff/libstuff.la $(UUID_LIB)

ld_classic_CFLAGS = -D__DARWIN_UNIX03 -I$(top_srcdir)/include -I$(top_srcdir)/include/foreign -I$(top_srcdir)/libstuff $(WARNINGS) $(LTO_DEF) $(ENDIAN_FLAG) -DDEBUG

8 changes: 4 additions & 4 deletions cctools/ld64/src/ld/Makefile.am
Original file line number Diff line number Diff line change
@@ -2,10 +2,10 @@ SUBDIRS = parsers passes

bin_PROGRAMS = ld
ld_LDADD = \
$(top_srcdir)/ld64/src/3rd/libhelper.la \
$(top_srcdir)/ld64/src/3rd/BlocksRuntime/libBlocksRuntime.la \
$(top_srcdir)/ld64/src/ld/parsers/libParsers.la \
$(top_srcdir)/ld64/src/ld/passes/libPasses.la \
$(top_builddir)/ld64/src/3rd/libhelper.la \
$(top_builddir)/ld64/src/3rd/BlocksRuntime/libBlocksRuntime.la \
$(top_builddir)/ld64/src/ld/parsers/libParsers.la \
$(top_builddir)/ld64/src/ld/passes/libPasses.la \
$(DL_LIB) \
$(UUID_LIB) \
$(LTO_LIB)
2 changes: 1 addition & 1 deletion cctools/ld64/src/ld/parsers/Makefile.am
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ noinst_HEADERS = \
opaque_section_file.h

libParsers_la_LIBADD = \
$(top_srcdir)/ld64/src/3rd/libhelper.la
$(top_builddir)/ld64/src/3rd/libhelper.la

libParsers_la_CXXFLAGS = \
-D__DARWIN_UNIX03 \
4 changes: 2 additions & 2 deletions cctools/ld64/src/other/Makefile.am
Original file line number Diff line number Diff line change
@@ -39,12 +39,12 @@ ObjectDump_SOURCES = \
ObjectDump.cpp \
$(top_srcdir)/ld64/src/ld/debugline.c
ObjectDump_LDADD = \
$(top_srcdir)/ld64/src/ld/parsers/libParsers.la \
$(top_builddir)/ld64/src/ld/parsers/libParsers.la \
$(LTO_LIB)


dyldinfo_SOURCES = dyldinfo.cpp
dyldinfo_LDADD = \
$(top_srcdir)/ld64/src/3rd/libhelper.la
$(top_builddir)/ld64/src/3rd/libhelper.la


2 changes: 1 addition & 1 deletion cctools/m4/llvm.m4
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ AC_DEFUN([CHECK_LLVM],
LTO_DEF=-DLTO_SUPPORT
# DO NOT include the LLVM include dir directly,
# it may cause the build to fail.
`cp -r $LLVM_INCLUDE_DIR/llvm-c/lto.h include/llvm-c/lto.h 2>/dev/null 1>&2`
cp -f $LLVM_INCLUDE_DIR/llvm-c/lto.h `dirname ${0}`/include/llvm-c/lto.h
AC_SUBST([LTO_DEF])
AC_SUBST([LTO_RPATH])
AC_SUBST([LTO_LIB]) ])
2 changes: 1 addition & 1 deletion cctools/misc/Makefile.am
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ bin_PROGRAMS = \
codesign_allocate

LDADD = \
$(top_srcdir)/libstuff/libstuff.la \
$(top_builddir)/libstuff/libstuff.la \
$(DL_LIB) \
$(LTO_RPATH)

6 changes: 3 additions & 3 deletions cctools/otool/Makefile.am
Original file line number Diff line number Diff line change
@@ -2,12 +2,12 @@ bin_PROGRAMS = otool

if ISDARWIN
otool_LDADD = \
$(top_srcdir)/libstuff/libstuff.la \
$(top_builddir)/libstuff/libstuff.la \
$(PTHREAD_FLAGS) $(CXXABI_LIB) $(DL_LIB) -lobjc
else
otool_LDADD = \
$(top_srcdir)/libstuff/libstuff.la \
$(top_srcdir)/libobjc2/libobjc.la \
$(top_builddir)/libstuff/libstuff.la \
$(top_builddir)/libobjc2/libobjc.la \
$(PTHREAD_FLAGS) $(CXXABI_LIB) $(DL_LIB)
endif

0 comments on commit e39e894

Please sign in to comment.