diff options
| -rw-r--r-- | Makefile.rules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.rules b/Makefile.rules index ac4a6fd66e..b719e8c130 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -363,8 +363,9 @@ ifeq ($(OS),HP-UX) CompileCommonOpts := -D_REENTRANT -D_HPUX_SOURCE endif -# If we are building a universal binary on Mac OS/X, pass extra options. This is -# useful to people that want to link the LLVM libraries into their universal apps. +# If we are building a universal binary on Mac OS/X, pass extra options. This +# is useful to people that want to link the LLVM libraries into their universal +# apps. ifdef UNIVERSAL CompileCommonOpts += \ -arch i386 -arch ppc -isysroot /Developer/SDKs/MACOSX10.4u.sdk/ @@ -374,12 +375,10 @@ ifdef UNIVERSAL DISABLE_AUTO_DEPENDENCIES=1 endif -# Temporary workaround for a Mac OSX / x86 compatibility issue. +# Temporary workaround for a Mac OSX compatibility issue. ifeq ($(OS),Darwin) -ifeq ($(ARCH),x86) CXX.Flags += -fno-use-cxa-atexit endif -endif LD.Flags += -L$(LibDir) -L$(LLVMLibDir) CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS @@ -786,7 +785,8 @@ else all-local:: $(LibName.BCA) ifdef EXPORTED_SYMBOL_FILE -BCLinkLib = $(GCCLD) -L$(CFERuntimeLibDir) -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) +BCLinkLib = $(GCCLD) -L$(CFERuntimeLibDir) \ + -internalize-public-api-file=$(EXPORTED_SYMBOL_FILE) $(LibName.BCA): $(ObjectsBC) $(LibDir)/.dir $(GCCLD) \ $(LLVMToolDir)/llvm-ar |