diff options
-rw-r--r-- | rbutil/libtools.make | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/Makefile.libs | 1 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 6 | ||||
-rw-r--r-- | tools/rbspeex/Makefile | 3 | ||||
-rw-r--r-- | tools/ucl/src/Makefile | 3 | ||||
-rw-r--r-- | utils/tomcrypt/Makefile | 4 |
6 files changed, 20 insertions, 0 deletions
diff --git a/rbutil/libtools.make b/rbutil/libtools.make index f9affdd9d4..dadc1a0545 100644 --- a/rbutil/libtools.make +++ b/rbutil/libtools.make | |||
@@ -75,6 +75,9 @@ ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | |||
75 | # that to determine if we need to set arch and isysroot. | 75 | # that to determine if we need to set arch and isysroot. |
76 | ifeq ($(findstring __clang__,$(CPPDEFINES)),__clang__) | 76 | ifeq ($(findstring __clang__,$(CPPDEFINES)),__clang__) |
77 | GCCFLAGS += -mmacosx-version-min=10.5 | 77 | GCCFLAGS += -mmacosx-version-min=10.5 |
78 | ifneq ($(ISYSROOT),) | ||
79 | GCCFLAGS += -isysroot $(ISYSROOT) | ||
80 | endif | ||
78 | else | 81 | else |
79 | # when building libs for OS X 10.4+ build for both i386 and ppc at the same time. | 82 | # when building libs for OS X 10.4+ build for both i386 and ppc at the same time. |
80 | # This creates fat objects, and ar can only create the archive but not operate | 83 | # This creates fat objects, and ar can only create the archive but not operate |
diff --git a/rbutil/rbutilqt/Makefile.libs b/rbutil/rbutilqt/Makefile.libs index 938426f124..ac4e31a9e4 100644 --- a/rbutil/rbutilqt/Makefile.libs +++ b/rbutil/rbutilqt/Makefile.libs | |||
@@ -32,6 +32,7 @@ export CXXFLAGS=$(EXTRALIB_CXXFLAGS) | |||
32 | export CC=$(EXTRALIBS_CC) | 32 | export CC=$(EXTRALIBS_CC) |
33 | export CXX=$(EXTRALIBS_CXX) | 33 | export CXX=$(EXTRALIBS_CXX) |
34 | export AR=$(EXTRALIBS_AR) | 34 | export AR=$(EXTRALIBS_AR) |
35 | export ISYSROOT=$(EXTRALIB_ISYSROOT) | ||
35 | 36 | ||
36 | libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt | 37 | libs: librbspeex libucl libipodpatcher libsansapatcher libmkamsboot libmktccboot libmkmpioboot libchinachippatcher libmkimxboot libmks5lboot libbzip2 libbspatch librbtomcrypt |
37 | 38 | ||
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index 9d7da92dbf..a7d0a179e6 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -35,6 +35,12 @@ EXTRALIBS_OPTS += EXTRALIBS_CC=\"$$QMAKE_CC\" | |||
35 | EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\" | 35 | EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\" |
36 | EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" | 36 | EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" |
37 | EXTRALIBS_OPTS += EXTRALIB_CXXFLAGS=\"$$MACHINEFLAGS\" | 37 | EXTRALIBS_OPTS += EXTRALIB_CXXFLAGS=\"$$MACHINEFLAGS\" |
38 | macx { | ||
39 | # on recent macOS we need to pass isysroot to the libs, otherwise it won't find | ||
40 | # the standard libaries. This is caused by the passed compiler (doesn't rely on | ||
41 | # default compiler but passed full path) | ||
42 | EXTRALIBS_OPTS += EXTRALIB_ISYSROOT=\"$$QMAKE_MAC_SDK.macosx.Path\" | ||
43 | } | ||
38 | 44 | ||
39 | MYBUILDDIR = $$OUT_PWD/build/ | 45 | MYBUILDDIR = $$OUT_PWD/build/ |
40 | MYLIBBUILDDIR = $$MYBUILDDIR/libs/ | 46 | MYLIBBUILDDIR = $$MYBUILDDIR/libs/ |
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile index 231cdb5517..b33534695c 100644 --- a/tools/rbspeex/Makefile +++ b/tools/rbspeex/Makefile | |||
@@ -41,6 +41,9 @@ ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | |||
41 | # that to determine if we need to set arch and isysroot. | 41 | # that to determine if we need to set arch and isysroot. |
42 | ifeq ($(findstring __clang__,$(CPPDEFINES)),__clang__) | 42 | ifeq ($(findstring __clang__,$(CPPDEFINES)),__clang__) |
43 | CFLAGS += -mmacosx-version-min=10.5 | 43 | CFLAGS += -mmacosx-version-min=10.5 |
44 | ifneq ($(ISYSROOT),) | ||
45 | CFLAGS += -isysroot $(ISYSROOT) | ||
46 | endif | ||
44 | else | 47 | else |
45 | # when building libs for OS X 10.4+ build for both i386 and ppc at the same time. | 48 | # when building libs for OS X 10.4+ build for both i386 and ppc at the same time. |
46 | # This creates fat objects, and ar can only create the archive but not operate | 49 | # This creates fat objects, and ar can only create the archive but not operate |
diff --git a/tools/ucl/src/Makefile b/tools/ucl/src/Makefile index a741f1ee8c..14ba2c2b04 100644 --- a/tools/ucl/src/Makefile +++ b/tools/ucl/src/Makefile | |||
@@ -36,6 +36,9 @@ ifeq ($(findstring APPLE,$(CPPDEFINES)),APPLE) | |||
36 | # that to determine if we need to set arch and isysroot. | 36 | # that to determine if we need to set arch and isysroot. |
37 | ifeq ($(findstring __clang__,$(CPPDEFINES)),__clang__) | 37 | ifeq ($(findstring __clang__,$(CPPDEFINES)),__clang__) |
38 | CFLAGS += -mmacosx-version-min=10.5 | 38 | CFLAGS += -mmacosx-version-min=10.5 |
39 | ifneq ($(ISYSROOT),) | ||
40 | CFLAGS += -isysroot $(ISYSROOT) | ||
41 | endif | ||
39 | else | 42 | else |
40 | # when building libs for OS X 10.4+ build for both i386 and ppc at the same time. | 43 | # when building libs for OS X 10.4+ build for both i386 and ppc at the same time. |
41 | # This creates fat objects, and ar can only create the archive but not operate | 44 | # This creates fat objects, and ar can only create the archive but not operate |
diff --git a/utils/tomcrypt/Makefile b/utils/tomcrypt/Makefile index ce0f9bae47..4ca8c4e843 100644 --- a/utils/tomcrypt/Makefile +++ b/utils/tomcrypt/Makefile | |||
@@ -16,6 +16,10 @@ endif | |||
16 | CFLAGS := -O3 -g -std=c99 -Wall $(DEFINES) -Isrc/headers | 16 | CFLAGS := -O3 -g -std=c99 -Wall $(DEFINES) -Isrc/headers |
17 | LDFLAGS := | 17 | LDFLAGS := |
18 | 18 | ||
19 | ifneq ($(ISYSROOT),) | ||
20 | CFLAGS += -isysroot $(ISYSROOT) | ||
21 | endif | ||
22 | |||
19 | SOURCES := \ | 23 | SOURCES := \ |
20 | src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c \ | 24 | src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c \ |
21 | src/misc/crypt/crypt_argchk.c src/misc/crypt/crypt_register_cipher.c src/misc/crypt/crypt_cipher_is_valid.c src/misc/crypt/crypt_cipher_descriptor.c \ | 25 | src/misc/crypt/crypt_argchk.c src/misc/crypt/crypt_register_cipher.c src/misc/crypt/crypt_cipher_is_valid.c src/misc/crypt/crypt_cipher_descriptor.c \ |