From 9adb64ec70047d7f8709399f67c74402753f6579 Mon Sep 17 00:00:00 2001 From: Ali Saidi Date: Thu, 16 Sep 2004 15:11:38 -0400 Subject: pc event now clears lower 2 bits always build with dynamic libraries for mysqlclient SConscript: always use dynamic library now cpu/pc_event.hh: cleared lower 2 bits, since everything must be 4byte aligned --HG-- extra : convert_revision : 332ecd25a598e6a46a79bd653449aa7eb22a580a --- SConscript | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'SConscript') diff --git a/SConscript b/SConscript index ddd16564b..310a7dd90 100644 --- a/SConscript +++ b/SConscript @@ -384,11 +384,12 @@ if env['USE_MYSQL']: env.Append(CPPDEFINES = 'USE_MYSQL') env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql']) env.Append(LIBS=['z']) - if sys.platform.lower().startswith('linux'): - extra_libraries.append('/usr/lib/mysql/libmysqlclient.a') + if os.path.isdir('/usr/lib64'): + env.Append(LIBPATH=['/usr/lib64/mysql']) else: - env.Append(LIBS=['mysql']) - env.Append(LIBPATH=['/usr/local/lib/mysql/']) + env.Append(LIBPATH=['/usr/lib/mysql/']) + env.Append(LIBS=['mysqlclient']) + ################################################### # -- cgit v1.2.3