Git.pm: Support for perl/ being built by a different compiler
dst_ on #git reported that on Solaris 9, Perl was built by Sun CC and perl/ is therefore being built with it as well, while the rest of Git is built with gcc. The problem (the first one visible, anyway) is that we passed perl/ even various gcc-specific options. This separates those to a special variable. This is not really meant for an application yet since it's not clear if it will alone help anything. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
Petr Baudis committed
Jun 25, 2006 at 03:47 UTC
8d7f586f13f5aac31dca22b1d726e1583e180cb5
1 file changed
+38
-28
Makefile
+38
-28
@@ -117,6 +117,11 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
117
118
### --- END CONFIGURATION SECTION ---
119
120
+# Those must not be GNU-specific; they are shared with perl/ which may
121
+# be built by a different compiler.
122
+BASIC_CFLAGS =
123
+BASIC_LDFLAGS =
124
+
125
SCRIPT_SH = \
126
git-bisect.sh git-branch.sh git-checkout.sh \
127
git-cherry.sh git-clean.sh git-clone.sh git-commit.sh \
@@ -254,13 +259,13 @@ ifeq ($(uname_S),Darwin)
259
NO_STRLCPY = YesPlease
260
## fink
261
ifeq ($(shell test -d /sw/lib && echo y),y)
257
- ALL_CFLAGS += -I/sw/include
258
- ALL_LDFLAGS += -L/sw/lib
262
+ BASIC_CFLAGS += -I/sw/include
263
+ BASIC_LDFLAGS += -L/sw/lib
264
endif
265
## darwinports
266
ifeq ($(shell test -d /opt/local/lib && echo y),y)
262
- ALL_CFLAGS += -I/opt/local/include
263
- ALL_LDFLAGS += -L/opt/local/lib
267
+ BASIC_CFLAGS += -I/opt/local/include
268
+ BASIC_LDFLAGS += -L/opt/local/lib
269
endif
270
endif
271
ifeq ($(uname_S),SunOS)
@@ -280,7 +285,7 @@ ifeq ($(uname_S),SunOS)
285
endif
286
INSTALL = ginstall
287
TAR = gtar
283
- ALL_CFLAGS += -D__EXTENSIONS__
288
+ BASIC_CFLAGS += -D__EXTENSIONS__
289
endif
290
ifeq ($(uname_O),Cygwin)
291
NO_D_TYPE_IN_DIRENT = YesPlease
@@ -298,21 +303,22 @@ ifeq ($(uname_O),Cygwin)
303
endif
304
ifeq ($(uname_S),FreeBSD)
305
NEEDS_LIBICONV = YesPlease
301
- ALL_CFLAGS += -I/usr/local/include
302
- ALL_LDFLAGS += -L/usr/local/lib
306
+ BASIC_CFLAGS += -I/usr/local/include
307
+ BASIC_LDFLAGS += -L/usr/local/lib
308
endif
309
ifeq ($(uname_S),OpenBSD)
310
NO_STRCASESTR = YesPlease
311
NEEDS_LIBICONV = YesPlease
307
- ALL_CFLAGS += -I/usr/local/include
308
- ALL_LDFLAGS += -L/usr/local/lib
312
+ BASIC_CFLAGS += -I/usr/local/include
313
+ BASIC_LDFLAGS += -L/usr/local/lib
314
endif
315
ifeq ($(uname_S),NetBSD)
316
ifeq ($(shell expr "$(uname_R)" : '[01]\.'),2)
317
NEEDS_LIBICONV = YesPlease
318
endif
314
- ALL_CFLAGS += -I/usr/pkg/include
315
- ALL_LDFLAGS += -L/usr/pkg/lib -Wl,-rpath,/usr/pkg/lib
319
+ BASIC_CFLAGS += -I/usr/pkg/include
320
+ BASIC_LDFLAGS += -L/usr/pkg/lib
321
+ ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
322
endif
323
ifeq ($(uname_S),AIX)
324
NO_STRCASESTR=YesPlease
@@ -326,9 +332,9 @@ ifeq ($(uname_S),IRIX64)
332
NO_STRLCPY = YesPlease
333
NO_SOCKADDR_STORAGE=YesPlease
334
SHELL_PATH=/usr/gnu/bin/bash
329
- ALL_CFLAGS += -DPATH_MAX=1024
335
+ BASIC_CFLAGS += -DPATH_MAX=1024
336
# for now, build 32-bit version
331
- ALL_LDFLAGS += -L/usr/lib32
337
+ BASIC_LDFLAGS += -L/usr/lib32
338
endif
339
ifneq (,$(findstring arm,$(uname_M)))
340
ARM_SHA1 = YesPlease
@@ -349,7 +355,7 @@ endif
355
ifndef NO_CURL
356
ifdef CURLDIR
357
# This is still problematic -- gcc does not always want -R.
352
- ALL_CFLAGS += -I$(CURLDIR)/include
358
+ BASIC_CFLAGS += -I$(CURLDIR)/include
359
CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl
360
else
361
CURL_LIBCURL = -lcurl
@@ -370,13 +376,13 @@ ifndef NO_OPENSSL
376
OPENSSL_LIBSSL = -lssl
377
ifdef OPENSSLDIR
378
# Again this may be problematic -- gcc does not always want -R.
373
- ALL_CFLAGS += -I$(OPENSSLDIR)/include
379
+ BASIC_CFLAGS += -I$(OPENSSLDIR)/include
380
OPENSSL_LINK = -L$(OPENSSLDIR)/lib -R$(OPENSSLDIR)/lib
381
else
382
OPENSSL_LINK =
383
endif
384
else
379
- ALL_CFLAGS += -DNO_OPENSSL
385
+ BASIC_CFLAGS += -DNO_OPENSSL
386
MOZILLA_SHA1 = 1
387
OPENSSL_LIBSSL =
388
endif
@@ -388,7 +394,7 @@ endif
394
ifdef NEEDS_LIBICONV
395
ifdef ICONVDIR
396
# Again this may be problematic -- gcc does not always want -R.
391
- ALL_CFLAGS += -I$(ICONVDIR)/include
397
+ BASIC_CFLAGS += -I$(ICONVDIR)/include
398
ICONV_LINK = -L$(ICONVDIR)/lib -R$(ICONVDIR)/lib
399
else
400
ICONV_LINK =
@@ -404,13 +410,13 @@ ifdef NEEDS_NSL
410
SIMPLE_LIB += -lnsl
411
endif
412
ifdef NO_D_TYPE_IN_DIRENT
407
- ALL_CFLAGS += -DNO_D_TYPE_IN_DIRENT
413
+ BASIC_CFLAGS += -DNO_D_TYPE_IN_DIRENT
414
endif
415
ifdef NO_D_INO_IN_DIRENT
410
- ALL_CFLAGS += -DNO_D_INO_IN_DIRENT
416
+ BASIC_CFLAGS += -DNO_D_INO_IN_DIRENT
417
endif
418
ifdef NO_SYMLINK_HEAD
413
- ALL_CFLAGS += -DNO_SYMLINK_HEAD
419
+ BASIC_CFLAGS += -DNO_SYMLINK_HEAD
420
endif
421
ifdef NO_STRCASESTR
422
COMPAT_CFLAGS += -DNO_STRCASESTR
@@ -433,13 +439,13 @@ ifdef NO_MMAP
439
COMPAT_OBJS += compat/mmap.o
440
endif
441
ifdef NO_IPV6
436
- ALL_CFLAGS += -DNO_IPV6
442
+ BASIC_CFLAGS += -DNO_IPV6
443
endif
444
ifdef NO_SOCKADDR_STORAGE
445
ifdef NO_IPV6
440
- ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in
446
+ BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in
447
else
442
- ALL_CFLAGS += -Dsockaddr_storage=sockaddr_in6
448
+ BASIC_CFLAGS += -Dsockaddr_storage=sockaddr_in6
449
endif
450
endif
451
ifdef NO_INET_NTOP
@@ -447,7 +453,7 @@ ifdef NO_INET_NTOP
453
endif
454
455
ifdef NO_ICONV
450
- ALL_CFLAGS += -DNO_ICONV
456
+ BASIC_CFLAGS += -DNO_ICONV
457
endif
458
459
ifdef PPC_SHA1
@@ -471,7 +477,7 @@ ifdef USE_PIC
477
ALL_CFLAGS += -fPIC
478
endif
479
ifdef NO_ACCURATE_DIFF
474
- ALL_CFLAGS += -DNO_ACCURATE_DIFF
480
+ BASIC_CFLAGS += -DNO_ACCURATE_DIFF
481
endif
482
483
# Shell quote (do not use $(call) to accomodate ancient setups);
@@ -491,8 +497,12 @@ GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
497
498
LIBS = $(GITLIBS) $(EXTLIBS)
499
494
-ALL_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
500
+BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER_SQ)' $(COMPAT_CFLAGS)
501
LIB_OBJS += $(COMPAT_OBJS)
502
+
503
+ALL_CFLAGS += $(BASIC_CFLAGS)
504
+ALL_LDFLAGS += $(BASIC_LDFLAGS)
505
+
506
export prefix TAR INSTALL DESTDIR SHELL_PATH template_dir
507
508
@@ -622,9 +632,9 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
632
rm -f $@ && $(AR) rcs $@ $(XDIFF_OBJS)
633
634
625
-PERL_DEFINE = $(ALL_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
635
+PERL_DEFINE = $(BASIC_CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"'
636
PERL_DEFINE_SQ = $(subst ','\'',$(PERL_DEFINE))
627
-PERL_LIBS = $(EXTLIBS)
637
+PERL_LIBS = $(BASIC_LDFLAGS) $(EXTLIBS)
638
PERL_LIBS_SQ = $(subst ','\'',$(PERL_LIBS))
639
perl/Makefile: perl/Git.pm perl/Makefile.PL GIT-CFLAGS
640
(cd perl && $(PERL_PATH) Makefile.PL \