Makefile: allow CONFIG_LDDIR=lib64 configuration

grischka committed 13 years ago

Commit 31864551 parent 4c2941d2 files · +14 −12Browse files

Unified · Split

2 files

@@ -43,17 +43,19 @@ endif · 42 unmodified lines
43	43	endif
44	44
45	45	ifeq ($(ARCH),i386)
46		−NATIVE_DEFINES=-DTCC_TARGET_I386
47		−NATIVE_DEFINES+=$(if $(wildcard /lib/i386-linux-gnu),-DCONFIG_MULTIARCHDIR=\"i386-linux-gnu\")
48		−NATIVE_DEFINES+=$(if $(wildcard /lib/i386-kfreebsd-gnu),-DCONFIG_MULTIARCHDIR=\"i386-kfreebsd-gnu\")
49		−NATIVE_DEFINES+=$(if $(wildcard /lib/i386-gnu),-DCONFIG_MULTIARCHDIR=\"i386-gnu\")
	46	+NATIVE_DEFINES=-DTCC_TARGET_I386
	47	+NATIVE_DEFINES+=\
	48	+ $(if $(wildcard /lib/i386-linux-gnu),-DCONFIG_MULTIARCHDIR=\"i386-linux-gnu\"\
	49	+ $(if $(wildcard /lib/i386-kfreebsd-gnu),-DCONFIG_MULTIARCHDIR=\"i386-kfreebsd-gnu\"\
	50	+ $(if $(wildcard /lib/i386-gnu),-DCONFIG_MULTIARCHDIR=\"i386-gnu\")))
50	51	CFLAGS+=-m32
51	52	else ifeq ($(ARCH),x86-64)
52	53	NATIVE_DEFINES=-DTCC_TARGET_X86_64
53	54	CFLAGS+=-m64
54		−NATIVE_DEFINES+=$(if $(wildcard /usr/lib64),-DCONFIG_LDDIR=\"lib64\")
55		−NATIVE_DEFINES+=$(if $(wildcard /lib/x86_64-linux-gnu),-DCONFIG_MULTIARCHDIR=\"x86_64-linux-gnu\")
56		−NATIVE_DEFINES+=$(if $(wildcard /lib/x86_64-kfreebsd-gnu),-DCONFIG_MULTIARCHDIR=\"x86_64-kfreebsd-gnu\")
	55	+NATIVE_DEFINES+=\
	56	+ $(if $(wildcard /usr/lib64),-DCONFIG_LDDIR=\"lib64\"\
	57	+ $(if $(wildcard /lib/x86_64-linux-gnu),-DCONFIG_MULTIARCHDIR=\"x86_64-linux-gnu\"\
	58	+ $(if $(wildcard /lib/x86_64-kfreebsd-gnu),-DCONFIG_MULTIARCHDIR=\"x86_64-kfreebsd-gnu\")))
57	59	endif
58	60
59	61	ifeq ($(ARCH),arm)

tcc.h+5−5

@@ -152,12 +152,12 @@ · 151 unmodified lines
152	152	# define CONFIG_SYSROOT ""
153	153	#endif
154	154
155		−#ifdef CONFIG_MULTIARCHDIR
156		−# define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR
157		−#endif
158		−
159	155	#ifndef CONFIG_LDDIR
160		−# define CONFIG_LDDIR "lib"
	156	+# ifdef CONFIG_MULTIARCHDIR
	157	+# define CONFIG_LDDIR "lib/" CONFIG_MULTIARCHDIR
	158	+# else
	159	+# define CONFIG_LDDIR "lib"
	160	+# endif
161	161	#endif
162	162
163	163	/* path to find crt1.o, crti.o and crtn.o */

Keyboard shortcuts